Compare commits
99 Commits
v1.7.4
..
20709fafd3
| Author | SHA1 | Date | |
|---|---|---|---|
| 20709fafd3 | |||
| 4e3aaea2d3 | |||
| f3e298e03b | |||
| e82840e552 | |||
| 7d83909214 | |||
| e4f4771020 | |||
| a49993bcf5 | |||
| e2dabb0a26 | |||
| f7d4b923f4 | |||
| 34ac08f153 | |||
| d093923a63 | |||
| 4021240df3 | |||
| 9263cb3722 | |||
| 1a5ed60912 | |||
| fe9e127b85 | |||
| 8e6b08400a | |||
| 9a752d08ad | |||
| 4fb23302be | |||
| b764f27186 | |||
| 3495c2f63e | |||
| beb0e32b7e | |||
| 19a1bb5e50 | |||
| 6e683f714d | |||
| ccc1cae6a8 | |||
| 13b0ea685a | |||
| 840a5c6c52 | |||
| c96cb5112d | |||
| 9479c649be | |||
| d65884dc44 | |||
| 29d7eff203 | |||
| c208551a44 | |||
| 7ab2219764 | |||
| 2ce444ec65 | |||
| ac06ed9ae6 | |||
| b2e3a83bb9 | |||
| 9ed094ba86 | |||
| 1ffe63827d | |||
| eb21827686 | |||
| 6938e730b6 | |||
| 174f1f9a64 | |||
| 30efd482d8 | |||
| 7dec45b374 | |||
| ea92acff3a | |||
| a3421c02e9 | |||
| 5563d89743 | |||
| 640ff90187 | |||
| 2eb7a5247a | |||
| 3336ff0c69 | |||
| da3a4cb349 | |||
| 0ddae4dd70 | |||
| 23210e6868 | |||
| 1c0fcd24e3 | |||
| d74f3acc97 | |||
| 014a057196 | |||
| 73483b0573 | |||
| 4855923008 | |||
| fc844078a6 | |||
| 02495245a5 | |||
| 330fb2130b | |||
| 5acefc1d59 | |||
| e77bf49146 | |||
| f59f866354 | |||
| 660c3787fd | |||
| e9741ff38d | |||
| 32608c8f71 | |||
| e1965db04e | |||
| 0ad344bab9 | |||
| 96719be78d | |||
| b90baec571 | |||
| 384f86a3b3 | |||
| e8ddf4e083 | |||
| 7ee64289a8 | |||
| f09f8a91ac | |||
| bcadd46ce2 | |||
| e76337502a | |||
| 968b7087b5 | |||
| 3deba3f369 | |||
| cf46ab0c85 | |||
| 09cc3edf6f | |||
| c95a3657c0 | |||
| 9843f4d032 | |||
| 9d9b9c9dc4 | |||
| 187ef52865 | |||
| 9925f1ced4 | |||
| ded414ba1a | |||
| 11d60e687b | |||
| d3038994c3 | |||
| 0d350e12c6 | |||
| c6acaace27 | |||
| 927c7c3c70 | |||
| bf0aa92497 | |||
| 88dd76a0e4 | |||
| cc04114f89 | |||
| f456ea4ddf | |||
| 77364daa67 | |||
| 1ab7b2427a | |||
| 82ecc9cfe2 | |||
| 65d9060e26 | |||
| ec4c157226 |
@@ -14,12 +14,7 @@
|
|||||||
"Bash(mv InputSelect.story.vue selectCheckbox.story.vue select/)",
|
"Bash(mv InputSelect.story.vue selectCheckbox.story.vue select/)",
|
||||||
"Bash(mv inputCheckbox.story.vue checkbox/)",
|
"Bash(mv inputCheckbox.story.vue checkbox/)",
|
||||||
"Bash(npx eslint *)",
|
"Bash(npx eslint *)",
|
||||||
"Bash(echo \"LINT EXIT: $?\")",
|
"Bash(echo \"LINT EXIT: $?\")"
|
||||||
"Bash(git commit *)",
|
|
||||||
"mcp__chrome__navigate_page",
|
|
||||||
"mcp__chrome__take_snapshot",
|
|
||||||
"mcp__chrome__click",
|
|
||||||
"mcp__chrome__evaluate_script"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Multiple (filtres) — défaut</h2>
|
|
||||||
<MalioAccordion v-model="multiple">
|
|
||||||
<MalioAccordionItem title="Prix" value="prix">
|
|
||||||
<p>Slider de prix ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat">
|
|
||||||
<p>Liste de checkboxes ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Marque" value="marque">
|
|
||||||
<p>Recherche + liste ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
<p class="mt-2 text-sm text-gray-500">Ouverts : {{ multiple }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Single (FAQ)</h2>
|
|
||||||
<MalioAccordion v-model="single" mode="single">
|
|
||||||
<MalioAccordionItem title="Question 1" value="q1">
|
|
||||||
<p>Réponse 1</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Question 2" value="q2">
|
|
||||||
<p>Réponse 2</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
<p class="mt-2 text-sm text-gray-500">Ouvert : {{ single }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Non contrôlé + defaultOpen</h2>
|
|
||||||
<MalioAccordion>
|
|
||||||
<MalioAccordionItem title="Section A" value="a" :default-open="true">
|
|
||||||
<p>Ouverte au montage</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Section B" value="b">
|
|
||||||
<p>Fermée au montage</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Section désactivée</h2>
|
|
||||||
<MalioAccordion>
|
|
||||||
<MalioAccordionItem title="Active" value="ok">
|
|
||||||
<p>Contenu accessible</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Désactivée" value="ko" :disabled="true">
|
|
||||||
<p>Inaccessible</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const multiple = ref<string[]>(['prix'])
|
|
||||||
const single = ref('q1')
|
|
||||||
</script>
|
|
||||||
@@ -50,25 +50,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex flex-wrap items-start gap-10">
|
|
||||||
<div class="w-[396px] space-y-3">
|
|
||||||
<h2 class="font-semibold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioDate
|
|
||||||
label="Date de naissance (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="w-[396px] space-y-3">
|
|
||||||
<h2 class="font-semibold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioDate
|
|
||||||
v-model="readonlyFilledDate"
|
|
||||||
label="Date de naissance (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -81,7 +62,6 @@ const now = new Date()
|
|||||||
const todayIso = toIso(now)
|
const todayIso = toIso(now)
|
||||||
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
||||||
|
|
||||||
const readonlyFilledDate = ref<string | null>('2026-06-15')
|
|
||||||
const value = ref<string | null>(null)
|
const value = ref<string | null>(null)
|
||||||
const erpValue = ref<string | null>(null)
|
const erpValue = ref<string | null>(null)
|
||||||
const bounded = ref<string | null>(null)
|
const bounded = ref<string | null>(null)
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="space-y-6 p-4">
|
|
||||||
<h1 class="text-2xl font-bold">MalioDateTime</h1>
|
|
||||||
|
|
||||||
<div class="flex flex-wrap items-start gap-10">
|
|
||||||
<div class="w-[480px] space-y-3">
|
|
||||||
<h2 class="font-semibold">Large (480px)</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="value"
|
|
||||||
label="Date et heure du rendez-vous"
|
|
||||||
hint="Choisis un jour puis une heure"
|
|
||||||
/>
|
|
||||||
<div class="rounded border p-3 text-sm">
|
|
||||||
<p>Valeur (ISO naïf) : <code>{{ value ?? 'null' }}</code></p>
|
|
||||||
</div>
|
|
||||||
<div class="flex gap-2">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="rounded bg-m-primary px-3 py-1.5 text-white"
|
|
||||||
@click="value = '2026-12-25T09:30:00'"
|
|
||||||
>
|
|
||||||
Forcer le 25/12/2026 09:30
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="rounded border px-3 py-1.5"
|
|
||||||
@click="value = null"
|
|
||||||
>
|
|
||||||
Réinitialiser
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="w-[396px] space-y-3">
|
|
||||||
<h2 class="font-semibold">ERP (396px)</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="erpValue"
|
|
||||||
label="Date et heure du rendez-vous"
|
|
||||||
hint="Largeur cible ERP"
|
|
||||||
/>
|
|
||||||
<div class="rounded border p-3 text-sm">
|
|
||||||
<p>Valeur (ISO naïf) : <code>{{ erpValue ?? 'null' }}</code></p>
|
|
||||||
</div>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="bounded"
|
|
||||||
label="Créneau borné"
|
|
||||||
:min="todayIso"
|
|
||||||
:max="maxIso"
|
|
||||||
hint="Entre aujourd'hui et +30 jours"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const pad = (n: number) => String(n).padStart(2, '0')
|
|
||||||
const toIso = (d: Date) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T00:00:00`
|
|
||||||
const now = new Date()
|
|
||||||
const todayIso = toIso(now)
|
|
||||||
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
|
||||||
|
|
||||||
const value = ref<string | null>(null)
|
|
||||||
const erpValue = ref<string | null>(null)
|
|
||||||
const bounded = ref<string | null>('2026-05-20T14:30:00')
|
|
||||||
</script>
|
|
||||||
@@ -1,276 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="space-y-6 p-4">
|
|
||||||
<h1 class="text-2xl font-bold">Champs en lecture seule (readonly)</h1>
|
|
||||||
<p class="text-sm text-m-muted">
|
|
||||||
Tous les champs de formulaire dans leur état <code>readonly</code>, vides puis remplis.
|
|
||||||
Règles : bordure noire même vide, label et icône gris quand vide → noir quand rempli,
|
|
||||||
pas de focus bleu ni de grossissement.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2 xl:grid-cols-3">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputText</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputText
|
|
||||||
label="Référence (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputText
|
|
||||||
model-value="Commande #A-2048"
|
|
||||||
label="Référence (rempli)"
|
|
||||||
icon-name="mdi:lock-outline"
|
|
||||||
icon-size="20"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputEmail</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputEmail
|
|
||||||
label="Adresse email (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputEmail
|
|
||||||
model-value="contact@malio.fr"
|
|
||||||
label="Adresse email (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputAmount</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputAmount
|
|
||||||
label="Montant (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputAmount
|
|
||||||
model-value="1250.00"
|
|
||||||
label="Montant (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputAutocomplete</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputAutocomplete
|
|
||||||
label="Pays (vide)"
|
|
||||||
:options="countryOptions"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputAutocomplete
|
|
||||||
model-value="de"
|
|
||||||
label="Pays (rempli)"
|
|
||||||
icon-name="mdi:lock-outline"
|
|
||||||
icon-position="left"
|
|
||||||
:options="countryOptions"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputPassword</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputPassword
|
|
||||||
label="Mot de passe (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputPassword
|
|
||||||
model-value="motdepasse123"
|
|
||||||
label="Mot de passe (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputTextArea</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputTextArea
|
|
||||||
label="Description (vide)"
|
|
||||||
:size="3"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputTextArea
|
|
||||||
model-value="Ce texte est en lecture seule et ne peut pas être modifié."
|
|
||||||
label="Description (rempli)"
|
|
||||||
:size="3"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputPhone</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputPhone
|
|
||||||
label="Téléphone (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputPhone
|
|
||||||
model-value="+33 6 12 34 56 78"
|
|
||||||
label="Téléphone (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioInputUpload</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioInputUpload
|
|
||||||
label="Fichier (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioInputUpload
|
|
||||||
model-value="document.pdf"
|
|
||||||
label="Fichier (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioSelect</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioSelect
|
|
||||||
label="Catégorie (readonly vide)"
|
|
||||||
:options="categoryOptions"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioSelect
|
|
||||||
:model-value="'a'"
|
|
||||||
label="Catégorie (readonly rempli)"
|
|
||||||
:options="categoryOptions"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioSelectCheckbox</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioSelectCheckbox
|
|
||||||
label="Catégories (readonly vide)"
|
|
||||||
:options="categoryOptions"
|
|
||||||
:display-tag="true"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioSelectCheckbox
|
|
||||||
:model-value="['a']"
|
|
||||||
label="Catégories (readonly rempli)"
|
|
||||||
:options="categoryOptions"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:display-tag="true"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioDate</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioDate
|
|
||||||
label="Date de naissance (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioDate
|
|
||||||
model-value="2026-06-15"
|
|
||||||
label="Date de naissance (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioDateTime</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioDateTime
|
|
||||||
label="Date et heure (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioDateTime
|
|
||||||
model-value="2026-12-25T09:30:00"
|
|
||||||
label="Date et heure (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioDateRange</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioDateRange
|
|
||||||
label="Période (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioDateRange
|
|
||||||
:model-value="rangeValue"
|
|
||||||
label="Période (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioDateWeek</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioDateWeek
|
|
||||||
label="Semaine (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioDateWeek
|
|
||||||
model-value="2026-W52"
|
|
||||||
label="Semaine (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">MalioTimePicker</h2>
|
|
||||||
<div class="space-y-4">
|
|
||||||
<MalioTimePicker
|
|
||||||
label="Heure (vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
<MalioTimePicker
|
|
||||||
model-value="14:30"
|
|
||||||
label="Heure (rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
type Option = {label: string; value: string | number}
|
|
||||||
|
|
||||||
const countryOptions: Option[] = [
|
|
||||||
{label: 'France', value: 'fr'},
|
|
||||||
{label: 'Belgique', value: 'be'},
|
|
||||||
{label: 'Canada', value: 'ca'},
|
|
||||||
{label: 'Suisse', value: 'ch'},
|
|
||||||
{label: 'Luxembourg', value: 'lu'},
|
|
||||||
{label: 'Allemagne', value: 'de'},
|
|
||||||
]
|
|
||||||
|
|
||||||
const categoryOptions: Option[] = [
|
|
||||||
{label: 'Catégorie A', value: 'a'},
|
|
||||||
{label: 'Catégorie B', value: 'b'},
|
|
||||||
]
|
|
||||||
|
|
||||||
const rangeValue = ref<{start: string; end: string}>({start: '2026-12-20', end: '2026-12-31'})
|
|
||||||
</script>
|
|
||||||
@@ -33,7 +33,7 @@ const drawerNoDismiss = ref(false)
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
<div class="rounded-lg border p-6">
|
||||||
<h2 class="mb-6 text-xl font-bold">Avec footer d'actions</h2>
|
<h2 class="mb-6 text-xl font-bold">Avec footer collant</h2>
|
||||||
<MalioButton label="Ouvrir le formulaire" variant="tertiary" @click="drawerForm = true" />
|
<MalioButton label="Ouvrir le formulaire" variant="tertiary" @click="drawerForm = true" />
|
||||||
<MalioDrawer v-model="drawerForm" drawer-class="max-w-lg">
|
<MalioDrawer v-model="drawerForm" drawer-class="max-w-lg">
|
||||||
<template #header>
|
<template #header>
|
||||||
@@ -45,27 +45,32 @@ const drawerNoDismiss = ref(false)
|
|||||||
<MalioInputText label="Email" />
|
<MalioInputText label="Email" />
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<div class="sticky bottom-0 flex gap-3 bg-white py-4">
|
||||||
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="drawerForm = false" />
|
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="drawerForm = false" />
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="drawerForm = false" />
|
<MalioButton label="Enregistrer" button-class="flex-1" @click="drawerForm = false" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</MalioDrawer>
|
</MalioDrawer>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
<div class="rounded-lg border p-6">
|
||||||
<h2 class="mb-6 text-xl font-bold">Footer fixe avec contenu long</h2>
|
<h2 class="mb-6 text-xl font-bold">Avec footer fixed bottom</h2>
|
||||||
<MalioButton label="Ouvrir (contenu long)" variant="tertiary" @click="drawerFixedFooter = true" />
|
<MalioButton label="Ouvrir (footer fixe)" variant="tertiary" @click="drawerFixedFooter = true" />
|
||||||
<MalioDrawer v-model="drawerFixedFooter">
|
<MalioDrawer v-model="drawerFixedFooter">
|
||||||
<template #header>
|
<template #header>
|
||||||
<h2 class="text-[24px] font-bold text-black">Conditions</h2>
|
<h2 class="text-[24px] font-bold text-black">Conditions</h2>
|
||||||
</template>
|
</template>
|
||||||
<!-- Pas de hack : le footer est hors zone scrollable, seul le body défile -->
|
<!-- pb-24 : laisse la place au footer fixe qui sort du flux et recouvrirait le bas du contenu -->
|
||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4 pb-24">
|
||||||
<p v-for="n in 12" :key="n" class="text-m-text">
|
<p v-for="n in 12" :key="n" class="text-m-text">
|
||||||
Paragraphe {{ n }} — contenu long pour forcer le scroll et montrer que seul le body défile, le footer restant fixé en bas.
|
Paragraphe {{ n }} — contenu long pour forcer le scroll et montrer que le footer reste fixé en bas du viewport.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<!-- fixed : positionné par rapport au viewport ; w-full max-w-md cale la largeur sur le drawer droite par défaut -->
|
||||||
|
<div class="fixed bottom-0 right-0 w-full max-w-md border-t border-m-border bg-white px-5 py-4">
|
||||||
<MalioButton label="Accepter" button-class="w-full" @click="drawerFixedFooter = false" />
|
<MalioButton label="Accepter" button-class="w-full" @click="drawerFixedFooter = false" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</MalioDrawer>
|
</MalioDrawer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<div class="w-[1348px]">
|
|
||||||
<div class="flex items-center justify-between mt-[46px]">
|
|
||||||
<div class="flex items-center gap-3">
|
|
||||||
<MalioButtonIcon
|
|
||||||
icon="mdi:arrow-left-bold"
|
|
||||||
icon-size="24"
|
|
||||||
aria-label="Précédent"
|
|
||||||
variant="ghost"
|
|
||||||
/>
|
|
||||||
<h1 class="text-[32px] text-m-primary font-bold">Filtres</h1>
|
|
||||||
</div>
|
|
||||||
<MalioButton
|
|
||||||
label="Filtres"
|
|
||||||
variant="tertiary"
|
|
||||||
icon-name="mdi:tune"
|
|
||||||
icon-position="left"
|
|
||||||
button-class="w-[184px] px-2 py-2 justify-start text-black gap-4"
|
|
||||||
@click="drawerOpen = true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<MalioDrawer
|
|
||||||
v-model="drawerOpen"
|
|
||||||
side="right"
|
|
||||||
drawer-class="max-w-[450px]"
|
|
||||||
body-class="p-0"
|
|
||||||
footer-class="justify-between gap-4 py-7"
|
|
||||||
>
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold uppercase">Filtres</h2>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<MalioAccordion>
|
|
||||||
<MalioAccordionItem title="Type de camion" value="camion">
|
|
||||||
<div class="flex flex-col gap-6">
|
|
||||||
<MalioCheckbox v-model="semiBenne" label="Semi Benne" />
|
|
||||||
<MalioCheckbox v-model="benne" label="Benne" />
|
|
||||||
</div>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
|
|
||||||
<MalioAccordionItem title="Date à Date" value="date">
|
|
||||||
<div class="grid grid-cols-[auto_1fr] items-center gap-x-3 gap-y-4">
|
|
||||||
<span>Du</span>
|
|
||||||
<MalioDate v-model="dateDebut"/>
|
|
||||||
<span>Au</span>
|
|
||||||
<MalioDate v-model="dateFin"/>
|
|
||||||
</div>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton
|
|
||||||
label="Réinitialiser"
|
|
||||||
variant="tertiary"
|
|
||||||
button-class="w-m-btn-action"
|
|
||||||
@click="resetFiltres"
|
|
||||||
/>
|
|
||||||
<MalioButton
|
|
||||||
label="Voir les résultats"
|
|
||||||
variant="primary"
|
|
||||||
button-class="w-[170px]"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</MalioDrawer>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const drawerOpen = ref(false)
|
|
||||||
|
|
||||||
const semiBenne = ref(false)
|
|
||||||
const benne = ref(false)
|
|
||||||
|
|
||||||
const dateDebut = ref<string | null>(null)
|
|
||||||
const dateFin = ref<string | null>(null)
|
|
||||||
|
|
||||||
function resetFiltres() {
|
|
||||||
semiBenne.value = false
|
|
||||||
benne.value = false
|
|
||||||
dateDebut.value = null
|
|
||||||
dateFin.value = null
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
/>
|
/>
|
||||||
<h1 class="text-[32px] text-m-primary font-bold">Ajouter un client</h1>
|
<h1 class="text-[32px] text-m-primary font-bold">Ajouter un client</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-[48px] grid grid-cols-3 gap-x-[80px] gap-y-5">
|
<div class="mt-[48px] grid grid-cols-3 gap-x-[80px] gap-y-8">
|
||||||
<MalioInputText
|
<MalioInputText
|
||||||
label="Nom du client (Entreprise)"
|
label="Nom du client (Entreprise)"
|
||||||
/>
|
/>
|
||||||
@@ -22,7 +22,6 @@
|
|||||||
/>
|
/>
|
||||||
<MalioSelectCheckbox
|
<MalioSelectCheckbox
|
||||||
v-model="multiselectValue"
|
v-model="multiselectValue"
|
||||||
error="test"
|
|
||||||
label="Catégorie"
|
label="Catégorie"
|
||||||
:options="[
|
:options="[
|
||||||
{label: 'Catégorie 1', value: 'Catégorie 1'},
|
{label: 'Catégorie 1', value: 'Catégorie 1'},
|
||||||
@@ -76,7 +75,7 @@
|
|||||||
<div class="mt-[60px]">
|
<div class="mt-[60px]">
|
||||||
<MalioTabList :tabs="tabs" v-model="tabsValue">
|
<MalioTabList :tabs="tabs" v-model="tabsValue">
|
||||||
<template #information>
|
<template #information>
|
||||||
<div class="grid grid-cols-3 gap-x-[80px] gap-y-5 mt-12 shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] py-4 pl-[28px] pr-[60px]">
|
<div class="grid grid-cols-3 gap-x-[80px] gap-y-8 mt-12 shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] py-4 pl-[28px] pr-[60px]">
|
||||||
<MalioInputTextArea label="Descritpion" resize="none" groupClass="row-span-2" textInput="h-full"/>
|
<MalioInputTextArea label="Descritpion" resize="none" groupClass="row-span-2" textInput="h-full"/>
|
||||||
<MalioInputText v-model="concurrent" label="Concurrent"/>
|
<MalioInputText v-model="concurrent" label="Concurrent"/>
|
||||||
<MalioDate
|
<MalioDate
|
||||||
@@ -93,7 +92,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #adresses>
|
<template #adresses>
|
||||||
<div class="relative grid grid-cols-3 gap-x-[80px] gap-y-5 mt-12 bg-white shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] py-4 pl-[28px] pr-[60px]">
|
<div class="relative grid grid-cols-3 gap-x-[80px] gap-y-8 mt-12 bg-white shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] py-4 pl-[28px] pr-[60px]">
|
||||||
<MalioButtonIcon
|
<MalioButtonIcon
|
||||||
icon="mdi:delete-outline"
|
icon="mdi:delete-outline"
|
||||||
aria-label="Supprimer l'adresse"
|
aria-label="Supprimer l'adresse"
|
||||||
|
|||||||
@@ -36,23 +36,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputAmount
|
|
||||||
label="Montant (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputAmount
|
|
||||||
v-model="readonlyFilledAmount"
|
|
||||||
label="Montant (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Erreur et succès</h2>
|
<h2 class="mb-4 text-xl font-bold">Erreur et succès</h2>
|
||||||
<div class="mt-4">
|
<div class="mt-4">
|
||||||
@@ -74,7 +57,4 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue'
|
|
||||||
|
|
||||||
const readonlyFilledAmount = ref('1250.00')
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
v-model="simpleValue"
|
v-model="simpleValue"
|
||||||
label="Pays"
|
label="Pays"
|
||||||
:options="staticOptions"
|
:options="staticOptions"
|
||||||
local-filter
|
|
||||||
/>
|
/>
|
||||||
<p class="mt-2 text-sm text-m-muted">
|
<p class="mt-2 text-sm text-m-muted">
|
||||||
Valeur sélectionnée : <code>{{ simpleValue ?? 'null' }}</code>
|
Valeur sélectionnée : <code>{{ simpleValue ?? 'null' }}</code>
|
||||||
@@ -21,7 +20,6 @@
|
|||||||
icon-name="mdi:magnify"
|
icon-name="mdi:magnify"
|
||||||
icon-position="left"
|
icon-position="left"
|
||||||
:options="staticOptions"
|
:options="staticOptions"
|
||||||
local-filter
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -82,25 +80,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputAutocomplete
|
|
||||||
label="Pays (readonly vide)"
|
|
||||||
:options="staticOptions"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputAutocomplete
|
|
||||||
v-model="readonlyFilledAutocomplete"
|
|
||||||
label="Pays (readonly rempli)"
|
|
||||||
:options="staticOptions"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
||||||
<MalioInputAutocomplete
|
<MalioInputAutocomplete
|
||||||
@@ -159,7 +138,6 @@ const staticOptions: Option[] = [
|
|||||||
{label: 'Italie', value: 'it'},
|
{label: 'Italie', value: 'it'},
|
||||||
]
|
]
|
||||||
|
|
||||||
const readonlyFilledAutocomplete = ref<string | number | null>('de')
|
|
||||||
const simpleValue = ref<string | number | null>(null)
|
const simpleValue = ref<string | number | null>(null)
|
||||||
const leftIconValue = ref<string | number | null>(null)
|
const leftIconValue = ref<string | number | null>(null)
|
||||||
const createValue = ref<string | number | null>(null)
|
const createValue = ref<string | number | null>(null)
|
||||||
|
|||||||
@@ -48,23 +48,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputEmail
|
|
||||||
label="Adresse email (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputEmail
|
|
||||||
v-model="readonlyFilledEmail"
|
|
||||||
label="Adresse email (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
||||||
<MalioInputEmail
|
<MalioInputEmail
|
||||||
@@ -101,35 +84,14 @@
|
|||||||
:success="dynamicSuccess"
|
:success="dynamicSuccess"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Email obligatoire</h2>
|
|
||||||
<MalioInputEmail
|
|
||||||
v-model="requiredEmail"
|
|
||||||
label="Email obligatoire"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Email normalisé (minuscules)</h2>
|
|
||||||
<MalioInputEmail
|
|
||||||
v-model="lowercaseEmail"
|
|
||||||
label="Email normalisé (minuscules)"
|
|
||||||
:lowercase="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
|
|
||||||
const readonlyFilledEmail = ref('contact@malio.fr')
|
|
||||||
const emailValue = ref('')
|
const emailValue = ref('')
|
||||||
const dynamicEmail = ref('')
|
const dynamicEmail = ref('')
|
||||||
const requiredEmail = ref('')
|
|
||||||
const lowercaseEmail = ref('')
|
|
||||||
|
|
||||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
|
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
|
||||||
const isDynamicValid = computed(() => emailRegex.test(dynamicEmail.value))
|
const isDynamicValid = computed(() => emailRegex.test(dynamicEmail.value))
|
||||||
|
|||||||
@@ -41,23 +41,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputPassword
|
|
||||||
label="Mot de passe (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputPassword
|
|
||||||
v-model="readonlyFilledPassword"
|
|
||||||
label="Mot de passe (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
||||||
<MalioInputPassword
|
<MalioInputPassword
|
||||||
@@ -100,7 +83,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
|
|
||||||
const readonlyFilledPassword = ref('motdepasse123')
|
|
||||||
const passwordValue = ref('')
|
const passwordValue = ref('')
|
||||||
const dynamicPassword = ref('')
|
const dynamicPassword = ref('')
|
||||||
|
|
||||||
|
|||||||
@@ -73,23 +73,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputPhone
|
|
||||||
label="Téléphone (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputPhone
|
|
||||||
v-model="readonlyFilledPhone"
|
|
||||||
label="Téléphone (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
||||||
<MalioInputPhone
|
<MalioInputPhone
|
||||||
@@ -138,7 +121,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
|
||||||
const readonlyFilledPhone = ref('+33 6 12 34 56 78')
|
|
||||||
const phoneValue = ref('')
|
const phoneValue = ref('')
|
||||||
const phoneAddable = ref('')
|
const phoneAddable = ref('')
|
||||||
const phoneFrench = ref('')
|
const phoneFrench = ref('')
|
||||||
|
|||||||
@@ -108,33 +108,6 @@
|
|||||||
icon-size="20"
|
icon-size="20"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputText
|
|
||||||
label="Référence (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputText
|
|
||||||
v-model="readonlyFilledValue"
|
|
||||||
label="Référence (readonly rempli)"
|
|
||||||
icon-name="mdi:lock-outline"
|
|
||||||
icon-size="20"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Champ obligatoire</h2>
|
|
||||||
<MalioInputText
|
|
||||||
label="Champ obligatoire"
|
|
||||||
:required="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec masque</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec masque</h2>
|
||||||
<MalioInputText
|
<MalioInputText
|
||||||
@@ -181,7 +154,6 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
const readonlyFilledValue = ref('Commande #A-2048')
|
|
||||||
const nameValue = ref('')
|
const nameValue = ref('')
|
||||||
const searchValue = ref('')
|
const searchValue = ref('')
|
||||||
const codeValue = ref('')
|
const codeValue = ref('')
|
||||||
|
|||||||
@@ -61,25 +61,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputTextArea
|
|
||||||
label="Description (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
:size="3"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputTextArea
|
|
||||||
v-model="readonlyFilledTextArea"
|
|
||||||
label="Description (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
:size="3"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Resize avec limites</h2>
|
<h2 class="mb-4 text-xl font-bold">Resize avec limites</h2>
|
||||||
<MalioInputTextArea
|
<MalioInputTextArea
|
||||||
@@ -113,7 +94,6 @@
|
|||||||
import {ref} from 'vue'
|
import {ref} from 'vue'
|
||||||
import MalioInputTextArea from '../../../../app/components/malio/input/InputTextArea.vue'
|
import MalioInputTextArea from '../../../../app/components/malio/input/InputTextArea.vue'
|
||||||
|
|
||||||
const readonlyFilledTextArea = ref('Ce texte est en lecture seule et ne peut pas être modifié.')
|
|
||||||
const hintValue = ref('')
|
const hintValue = ref('')
|
||||||
const iconValue = ref('')
|
const iconValue = ref('')
|
||||||
const errorValue = ref('abc')
|
const errorValue = ref('abc')
|
||||||
|
|||||||
@@ -31,23 +31,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioInputUpload
|
|
||||||
label="Fichier (readonly vide)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioInputUpload
|
|
||||||
v-model="readonlyFilledUpload"
|
|
||||||
label="Fichier (readonly rempli)"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
<h2 class="mb-4 text-xl font-bold">Avec hint</h2>
|
||||||
<MalioInputUpload
|
<MalioInputUpload
|
||||||
@@ -91,7 +74,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed, ref } from 'vue'
|
||||||
|
|
||||||
const readonlyFilledUpload = ref('document.pdf')
|
|
||||||
const uploadValue = ref('')
|
const uploadValue = ref('')
|
||||||
const dynamicUpload = ref('')
|
const dynamicUpload = ref('')
|
||||||
|
|
||||||
|
|||||||
@@ -1,74 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
import { ref } from 'vue'
|
|
||||||
import MalioButton from "../../../../app/components/malio/button/Button.vue";
|
|
||||||
|
|
||||||
const modalBase = ref(false)
|
|
||||||
const modalForm = ref(false)
|
|
||||||
const modalLong = ref(false)
|
|
||||||
const modalNoDismiss = ref(false)
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Modal simple</h2>
|
|
||||||
<MalioButton label="Ouvrir" @click="modalBase = true" />
|
|
||||||
<MalioModal v-model="modalBase" headerClass="py-7 px-[25px]" footerClass="flex justify-center pt-8">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Marquer comme vu ?</h2>
|
|
||||||
</template>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Valider"/>
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Avec footer d'actions</h2>
|
|
||||||
<MalioButton label="Ouvrir le formulaire" variant="tertiary" @click="modalForm = true" />
|
|
||||||
<MalioModal v-model="modalForm" modal-class="max-w-lg">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Nouveau contact</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4 py-2">
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<MalioInputText label="Prénom" />
|
|
||||||
<MalioInputText label="Email" />
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="modalForm = false" />
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="modalForm = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Contenu long (body scrollable)</h2>
|
|
||||||
<MalioButton label="Ouvrir" variant="tertiary" @click="modalLong = true" />
|
|
||||||
<MalioModal v-model="modalLong">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Conditions</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4">
|
|
||||||
<p v-for="n in 20" :key="n" class="text-m-text">
|
|
||||||
Paragraphe {{ n }} — contenu long pour forcer le scroll interne ; le header et le footer restent fixes.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Accepter" button-class="w-full" @click="modalLong = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Non dismissable (croix uniquement)</h2>
|
|
||||||
<MalioButton label="Ouvrir" variant="danger" @click="modalNoDismiss = true" />
|
|
||||||
<MalioModal v-model="modalNoDismiss" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Action requise</h2>
|
|
||||||
</template>
|
|
||||||
<p class="text-m-text">Ni le backdrop ni Échap ne ferment cette modal. Utilisez la croix.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
@@ -82,17 +82,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Sélection obligatoire</h2>
|
|
||||||
<MalioSelect
|
|
||||||
v-model="requiredValue"
|
|
||||||
:options="options"
|
|
||||||
label="Sélection obligatoire"
|
|
||||||
:required="true"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
<div class="rounded-lg border p-4">
|
||||||
<h2 class="mb-4 text-xl font-bold">Peu d'elements (2)</h2>
|
<h2 class="mb-4 text-xl font-bold">Peu d'elements (2)</h2>
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
@@ -103,28 +92,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule (vide)</h2>
|
|
||||||
<MalioSelect
|
|
||||||
v-model="readonlyEmptyValue"
|
|
||||||
:options="options"
|
|
||||||
label="Pays"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule (rempli)</h2>
|
|
||||||
<MalioSelect
|
|
||||||
v-model="readonlyFilledValue"
|
|
||||||
:options="options"
|
|
||||||
label="Pays"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4 md:col-span-2">
|
<div class="rounded-lg border p-4 md:col-span-2">
|
||||||
<h2 class="mb-4 text-xl font-bold">Liste longue</h2>
|
<h2 class="mb-4 text-xl font-bold">Liste longue</h2>
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
@@ -184,7 +151,6 @@ const longOptions = [
|
|||||||
{label: 'Republique tcheque', value: 'cz'},
|
{label: 'Republique tcheque', value: 'cz'},
|
||||||
]
|
]
|
||||||
|
|
||||||
const requiredValue = ref<string | number | null>(null)
|
|
||||||
const basicValue = ref<string | number | null>(null)
|
const basicValue = ref<string | number | null>(null)
|
||||||
const labelValue = ref<string | number | null>(null)
|
const labelValue = ref<string | number | null>(null)
|
||||||
const selectedValue = ref<string | number | null>('fr')
|
const selectedValue = ref<string | number | null>('fr')
|
||||||
@@ -196,6 +162,4 @@ const emptyValue = ref<string | number | null>(null)
|
|||||||
const shortListValue = ref<string | number | null>(null)
|
const shortListValue = ref<string | number | null>(null)
|
||||||
const longListValue = ref<string | number | null>(null)
|
const longListValue = ref<string | number | null>(null)
|
||||||
const bottomValue = ref<string | number | null>(null)
|
const bottomValue = ref<string | number | null>(null)
|
||||||
const readonlyEmptyValue = ref<string | number | null>(null)
|
|
||||||
const readonlyFilledValue = ref<string | number | null>('fr')
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -123,28 +123,6 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule (vide)</h2>
|
|
||||||
<MalioSelectCheckbox
|
|
||||||
v-model="readonlyEmptyValue"
|
|
||||||
:options="options"
|
|
||||||
label="Pays"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule (rempli)</h2>
|
|
||||||
<MalioSelectCheckbox
|
|
||||||
v-model="readonlyFilledValue"
|
|
||||||
:options="options"
|
|
||||||
label="Pays"
|
|
||||||
empty-option-label="Aucune selection"
|
|
||||||
:readonly="true"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4 md:col-span-2">
|
<div class="rounded-lg border p-4 md:col-span-2">
|
||||||
<h2 class="mb-4 text-xl font-bold">Liste longue</h2>
|
<h2 class="mb-4 text-xl font-bold">Liste longue</h2>
|
||||||
<MalioSelectCheckbox
|
<MalioSelectCheckbox
|
||||||
@@ -167,7 +145,6 @@
|
|||||||
empty-option-label="Aucune selection"
|
empty-option-label="Aucune selection"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -213,6 +190,4 @@ const selectAllValue = ref<Array<string | number>>([])
|
|||||||
const selectAllCustomValue = ref<Array<string | number>>([])
|
const selectAllCustomValue = ref<Array<string | number>>([])
|
||||||
const longListValue = ref<Array<string | number>>([])
|
const longListValue = ref<Array<string | number>>([])
|
||||||
const bottomValue = ref<Array<string | number>>([])
|
const bottomValue = ref<Array<string | number>>([])
|
||||||
const readonlyEmptyValue = ref<Array<string | number>>([])
|
|
||||||
const readonlyFilledValue = ref<Array<string | number>>(['fr'])
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -36,36 +36,6 @@
|
|||||||
<template #details><p class="p-4">Détails avancés</p></template>
|
<template #details><p class="p-4">Détails avancés</p></template>
|
||||||
</MalioTabList>
|
</MalioTabList>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-1 text-xl font-bold">Beaucoup d'onglets (fenêtré)</h2>
|
|
||||||
<p class="mb-4 text-sm text-m-muted">
|
|
||||||
7 onglets avec <code>:max-visible-tabs="5"</code> — flèches gauche/droite pour faire défiler
|
|
||||||
(1 par 1). L'onglet actif reste sélectionné même hors fenêtre.
|
|
||||||
</p>
|
|
||||||
<MalioTabList v-model="manyValue" :tabs="manyTabs" :max-visible-tabs="5">
|
|
||||||
<template #infos><p class="p-4">Contenu Informations</p></template>
|
|
||||||
<template #adresses><p class="p-4">Contenu Adresses</p></template>
|
|
||||||
<template #contacts><p class="p-4">Contenu Contacts</p></template>
|
|
||||||
<template #compta><p class="p-4">Contenu Comptabilité</p></template>
|
|
||||||
<template #documents><p class="p-4">Contenu Documents</p></template>
|
|
||||||
<template #historique><p class="p-4">Contenu Historique</p></template>
|
|
||||||
<template #parametres><p class="p-4">Contenu Paramètres</p></template>
|
|
||||||
</MalioTabList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-1 text-xl font-bold">Peu d'onglets avec maxVisibleTabs</h2>
|
|
||||||
<p class="mb-4 text-sm text-m-muted">
|
|
||||||
3 onglets avec <code>:max-visible-tabs="5"</code> — le fenêtrage ne s'active pas
|
|
||||||
(onglets ≤ max), donc pas de flèches, affichage normal centré.
|
|
||||||
</p>
|
|
||||||
<MalioTabList v-model="fewValue" :tabs="fewTabs" :max-visible-tabs="5">
|
|
||||||
<template #general><p class="p-4">Contenu Général</p></template>
|
|
||||||
<template #adresses><p class="p-4">Contenu Adresses</p></template>
|
|
||||||
<template #contacts><p class="p-4">Contenu Contacts</p></template>
|
|
||||||
</MalioTabList>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -90,25 +60,7 @@ const tabsTwo = [
|
|||||||
{ key: 'details', label: 'Détails', icon: 'mdi:cog-outline' },
|
{ key: 'details', label: 'Détails', icon: 'mdi:cog-outline' },
|
||||||
]
|
]
|
||||||
|
|
||||||
const manyTabs = [
|
|
||||||
{ key: 'infos', label: 'Informations', icon: 'mdi:information-outline' },
|
|
||||||
{ key: 'adresses', label: 'Adresses', icon: 'mdi:map-marker-outline' },
|
|
||||||
{ key: 'contacts', label: 'Contacts', icon: 'mdi:account-box-outline' },
|
|
||||||
{ key: 'compta', label: 'Comptabilité', icon: 'mdi:web' },
|
|
||||||
{ key: 'documents', label: 'Documents', icon: 'mdi:file-document-outline' },
|
|
||||||
{ key: 'historique', label: 'Historique', icon: 'mdi:history' },
|
|
||||||
{ key: 'parametres', label: 'Paramètres', icon: 'mdi:cog-outline' },
|
|
||||||
]
|
|
||||||
|
|
||||||
const simpleValue = ref('qualimat')
|
const simpleValue = ref('qualimat')
|
||||||
const noIconValue = ref('tab1')
|
const noIconValue = ref('tab1')
|
||||||
const twoTabValue = ref('general')
|
const twoTabValue = ref('general')
|
||||||
const manyValue = ref('infos')
|
|
||||||
|
|
||||||
const fewTabs = [
|
|
||||||
{ key: 'general', label: 'Général', icon: 'mdi:information-outline' },
|
|
||||||
{ key: 'adresses', label: 'Adresses', icon: 'mdi:map-marker-outline' },
|
|
||||||
{ key: 'contacts', label: 'Contacts', icon: 'mdi:account-box-outline' },
|
|
||||||
]
|
|
||||||
const fewValue = ref('general')
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Simple</h2>
|
|
||||||
<MalioTimePicker v-model="simpleValue" label="Heure" />
|
|
||||||
<p class="mt-2 text-sm text-m-muted">Valeur : {{ simpleValue || '—' }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Valeur initiale</h2>
|
|
||||||
<MalioTimePicker v-model="initialValue" label="Heure de départ" hint="Format HH:MM" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Désactivé</h2>
|
|
||||||
<MalioTimePicker v-model="disabledValue" label="Heure verrouillée" disabled />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Erreur</h2>
|
|
||||||
<MalioTimePicker v-model="errorValue" label="Heure de fermeture" error="Heure invalide" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Succès</h2>
|
|
||||||
<MalioTimePicker v-model="successValue" label="Heure confirmée" success="Horaire enregistré" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Non effaçable</h2>
|
|
||||||
<MalioTimePicker v-model="noClearValue" label="Heure" :clearable="false" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly vide)</h2>
|
|
||||||
<MalioTimePicker label="Heure (readonly vide)" :readonly="true" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Readonly (readonly rempli)</h2>
|
|
||||||
<MalioTimePicker v-model="readonlyFilledTime" label="Heure (readonly rempli)" :readonly="true" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const readonlyFilledTime = ref('14:30')
|
|
||||||
const simpleValue = ref('')
|
|
||||||
const initialValue = ref('08:30')
|
|
||||||
const disabledValue = ref('14:15')
|
|
||||||
const errorValue = ref('25:90')
|
|
||||||
const successValue = ref('09:00')
|
|
||||||
const noClearValue = ref('10:00')
|
|
||||||
</script>
|
|
||||||
@@ -32,9 +32,7 @@ export const navSections: SidebarSection[] = [
|
|||||||
{label: 'Date', to: '/composant/date/date'},
|
{label: 'Date', to: '/composant/date/date'},
|
||||||
{label: 'Plage de dates', to: '/composant/date/dateRange'},
|
{label: 'Plage de dates', to: '/composant/date/dateRange'},
|
||||||
{label: 'Semaine', to: '/composant/date/dateWeek'},
|
{label: 'Semaine', to: '/composant/date/dateWeek'},
|
||||||
{label: 'Date & heure', to: '/composant/date/datetime'},
|
|
||||||
{label: 'Heure', to: '/composant/time/time'},
|
{label: 'Heure', to: '/composant/time/time'},
|
||||||
{label: 'Sélecteur d\'heure', to: '/composant/time/timePicker'},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -53,9 +51,7 @@ export const navSections: SidebarSection[] = [
|
|||||||
items: [
|
items: [
|
||||||
{label: 'Sidebar', to: '/composant/sidebar/sidebar'},
|
{label: 'Sidebar', to: '/composant/sidebar/sidebar'},
|
||||||
{label: 'Drawer', to: '/composant/drawer/drawer'},
|
{label: 'Drawer', to: '/composant/drawer/drawer'},
|
||||||
{label: 'Modal', to: '/composant/modal/modal'},
|
|
||||||
{label: 'Onglets', to: '/composant/tab/tabList'},
|
{label: 'Onglets', to: '/composant/tab/tabList'},
|
||||||
{label: 'Accordéon', to: '/composant/accordion/accordion'},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -69,11 +65,8 @@ export const navSections: SidebarSection[] = [
|
|||||||
label: 'DIVERS',
|
label: 'DIVERS',
|
||||||
icon: 'mdi:dots-horizontal',
|
icon: 'mdi:dots-horizontal',
|
||||||
items: [
|
items: [
|
||||||
{label: 'Champs readonly', to: '/composant/divers/readonly'},
|
|
||||||
{label: 'Heure', to: '/composant/time/time'},
|
|
||||||
{label: 'Sélecteur de site', to: '/composant/site/siteSelector'},
|
{label: 'Sélecteur de site', to: '/composant/site/siteSelector'},
|
||||||
{label: 'Formulaire client', to: '/composant/form/client'},
|
{label: 'Formulaire client', to: '/composant/form/client'},
|
||||||
{label: 'Filtres', to: '/composant/filtre/filtres'},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -32,29 +32,10 @@ Liste des évolutions de la librairie Malio layer UI
|
|||||||
* [#MUI-32] Création d'un composant saisie assistée (autocomplete)
|
* [#MUI-32] Création d'un composant saisie assistée (autocomplete)
|
||||||
* [#MUI-34] Revoir le système de playground
|
* [#MUI-34] Revoir le système de playground
|
||||||
* [#MUI-33] Développer le composant Datepicker
|
* [#MUI-33] Développer le composant Datepicker
|
||||||
* [#MUI-33] Création du composant DateTime (date + heure, sélecteur d'heure natif intérimaire)
|
|
||||||
* [#MUI-36] Création d'un composant modal (dialogue centré, focus-trap, scroll-lock, footer fixe)
|
|
||||||
* [#MUI-37] Création d'un composant accordéon
|
|
||||||
* [#MUI-39] Création d'un sélecteur d'heure à molettes (MalioTimePicker) ; DateTime rebranché dessus (remplace l'input time natif intérimaire)
|
|
||||||
* InputAutocomplete : prop `localFilter` pour le filtrage côté client des listes statiques (case-insensitive `label.includes(query)`), sans avoir à brancher `@search`
|
|
||||||
* InputTextArea : la scrollbar passe en primary (bleu) au focus, comme la liste du Select
|
|
||||||
* Token Tailwind partagé `w-m-btn-action` (150px) exposé via `tailwind.config.ts` + CSS var `--m-btn-action-width` dans `malio.css` — utilisable côté consommateur pour les boutons d'action (`<MalioButton button-class="w-m-btn-action" />`), themable en redéfinissant la CSS var
|
|
||||||
* [#MUI-41] Prop `required` cohérente + astérisque rouge dans le label sur la famille formulaire (Select, SelectCheckbox, InputUpload, InputRichText gagnent la prop)
|
|
||||||
* [#MUI-41] InputEmail : sanitisation à la saisie (suppression des espaces, option `lowercase`)
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* [#MUI-35] Refonte du composant drawer : slots `#header`/`#footer`, prop `side` (droite/gauche), `dismissable`, `closeOnEscape`, classes d'override, focus-trap, scroll-lock et fermeture au clavier. **Breaking** : la prop `title` est remplacée par le slot `#header`.
|
* [#MUI-35] Refonte du composant drawer : slots `#header`/`#footer`, prop `side` (droite/gauche), `dismissable`, `closeOnEscape`, classes d'override, focus-trap, scroll-lock et fermeture au clavier. **Breaking** : la prop `title` est remplacée par le slot `#header`.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* DataTable : pagination réalignée verticalement après l'introduction du `min-h-[1rem]` du Select — la barre pagination passe en `items-center`, et le MalioSelect du sélecteur de perPage est encapsulé dans un wrapper `h-12` qui borne sa taille flex à la hauteur du field (le slot vide déborde invisiblement en dessous). Span « Lignes : » et boutons Prev/Page/Next sont désormais centrés exactement sur le field (y=24)
|
|
||||||
* Drawer : le slot `#footer` est désormais rendu hors de la zone scrollable (épinglé en bas, comme la modal) ; seul le body défile et la scrollbar ne s'étend plus derrière le footer
|
|
||||||
* Hauteur des boutons de pagination du datatable alignée sur le select (40px)
|
* Hauteur des boutons de pagination du datatable alignée sur le select (40px)
|
||||||
* Distribution de `tailwind.config.ts` aux projets consommateurs avec paths `content` absolus
|
* Distribution de `tailwind.config.ts` aux projets consommateurs avec paths `content` absolus
|
||||||
* Espace réservé (`min-h-[1rem]`) pour le paragraphe hint/error/success de 15 composants (Input*, Select*, Time*, CalendarField, Checkbox) — l'apparition d'une erreur ne décale plus les cellules voisines dans une grille
|
|
||||||
* InputPhone : la croix `+` (add button) suit la même cascade d'état que les autres icônes du champ (muted / primary en focus / black quand rempli / danger / success) au lieu d'être figée en primary
|
|
||||||
* Select / SelectCheckbox : le chevron suit l'état du champ (muted par défaut, primary à l'ouverture, black avec une option sélectionnée, danger / success en cas d'erreur ou succès) au lieu de `text-current`
|
|
||||||
* InputTextArea : composant single-root (était multi-root) — le wrapper du message ne prend plus sa propre cellule de grille, `row-span-2` fonctionne à nouveau
|
|
||||||
* Label désactivé en `text-m-muted` (gris des bordures) au lieu de `text-black/60` sur les inputs à floating-label (InputText, Email, Password, Amount, Phone, Upload, Autocomplete, TextArea, RichText)
|
|
||||||
* InputAutocomplete : suppression de 4 sources de saut visuel au focus / ouverture (extra translate label, padding `grow-height:focus`, `focus:pl-[11px]`, `!border-b-0` remplacé par `!border-b-transparent`)
|
|
||||||
* Select / SelectCheckbox : mêmes correctifs anti-saut (suppression du padding `grow-height:focus` et remplacement de `!border-b-0` / `!border-t-0` par leurs variantes `transparent`)
|
|
||||||
* MalioButton : largeur par défaut alignée sur `w-[200px]` (au lieu de `w-[240px]`) pour correspondre au sizing des formulaires de l'app
|
|
||||||
|
|||||||
+15
-355
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
Tous les composants sont auto-importés avec le préfixe `Malio`. Utiliser `v-model` pour le binding bidirectionnel sur les composants de formulaire.
|
Tous les composants sont auto-importés avec le préfixe `Malio`. Utiliser `v-model` pour le binding bidirectionnel sur les composants de formulaire.
|
||||||
|
|
||||||
> **Champ obligatoire :** sur les composants de formulaire, la prop `required` ajoute un astérisque rouge dans le label. C'est un repère visuel ; la sémantique « obligatoire » est portée par l'attribut natif `required` ou `aria-required`.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioInputText
|
## MalioInputText
|
||||||
@@ -17,11 +15,10 @@ Champ texte avec label, icône optionnelle et support de masque de saisie.
|
|||||||
| `modelValue` | `string \| null` | `undefined` | Valeur (v-model) |
|
| `modelValue` | `string \| null` | `undefined` | Valeur (v-model) |
|
||||||
| `disabled` | `boolean` | `false` | Désactive le champ |
|
| `disabled` | `boolean` | `false` | Désactive le champ |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
| `required` | `boolean` | `false` | Champ requis |
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `iconName` | `string` | `''` | Icône Iconify (ex: `mdi:magnify`) |
|
| `iconName` | `string` | `''` | Icône Iconify (ex: `mdi:magnify`) |
|
||||||
| `iconPosition` | `'left' \| 'right'` | `'right'` | Position de l'icône |
|
| `iconPosition` | `'left' \| 'right'` | `'right'` | Position de l'icône |
|
||||||
| `iconSize` | `string \| number` | `24` | Taille icône |
|
| `iconSize` | `string \| number` | `24` | Taille icône |
|
||||||
@@ -56,11 +53,9 @@ Champ mot de passe avec toggle visibilité.
|
|||||||
| `displayIcon` | `boolean` | `true` | Afficher l'icône toggle |
|
| `displayIcon` | `boolean` | `true` | Afficher l'icône toggle |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
|
|
||||||
@@ -84,12 +79,10 @@ Champ email (`type="email"` + `inputmode="email"`) avec icône `mdi:email-outlin
|
|||||||
| `autocomplete` | `string` | `'off'` | Autocomplétion (passer `'email'` pour suggérer l'email utilisateur) |
|
| `autocomplete` | `string` | `'off'` | Autocomplétion (passer `'email'` pour suggérer l'email utilisateur) |
|
||||||
| `disabled` | `boolean` | `false` | Désactive le champ |
|
| `disabled` | `boolean` | `false` | Désactive le champ |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
| `required` | `boolean` | `false` | Champ requis |
|
||||||
| `lowercase` | `boolean` | `false` | Normalise la saisie en minuscules à la frappe |
|
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `iconName` | `string` | `'mdi:email-outline'` | Icône Iconify (chaîne vide pour masquer) |
|
| `iconName` | `string` | `'mdi:email-outline'` | Icône Iconify (chaîne vide pour masquer) |
|
||||||
| `iconPosition` | `'left' \| 'right'` | `'right'` | Position de l'icône |
|
| `iconPosition` | `'left' \| 'right'` | `'right'` | Position de l'icône |
|
||||||
| `iconSize` | `string \| number` | `24` | Taille icône |
|
| `iconSize` | `string \| number` | `24` | Taille icône |
|
||||||
@@ -98,8 +91,6 @@ Champ email (`type="email"` + `inputmode="email"`) avec icône `mdi:email-outlin
|
|||||||
| `labelClass` | `string` | `''` | Classes CSS label |
|
| `labelClass` | `string` | `''` | Classes CSS label |
|
||||||
| `groupClass` | `string` | `''` | Classes CSS conteneur |
|
| `groupClass` | `string` | `''` | Classes CSS conteneur |
|
||||||
|
|
||||||
> **Sanitisation à la saisie :** tous les espaces sont supprimés automatiquement au fil de la frappe (sans masque). Avec `lowercase=true`, la valeur est également convertie en minuscules à la frappe. La validation du format (ex. présence d'un `@`) reste à la charge du parent via la prop `error` ou la couche de validation.
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
|
|
||||||
```vue
|
```vue
|
||||||
@@ -124,11 +115,10 @@ Champ téléphone (`type="tel"` + `inputmode="tel"`) avec icône `mdi:phone-outl
|
|||||||
| `autocomplete` | `string` | `'off'` | Autocomplétion (passer `'tel'` pour suggérer un numéro enregistré) |
|
| `autocomplete` | `string` | `'off'` | Autocomplétion (passer `'tel'` pour suggérer un numéro enregistré) |
|
||||||
| `disabled` | `boolean` | `false` | Désactive le champ et le bouton + |
|
| `disabled` | `boolean` | `false` | Désactive le champ et le bouton + |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule (désactive aussi le bouton +) |
|
| `readonly` | `boolean` | `false` | Lecture seule (désactive aussi le bouton +) |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
| `required` | `boolean` | `false` | Champ requis |
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `iconName` | `string` | `'mdi:phone-outline'` | Icône Iconify (chaîne vide pour masquer) |
|
| `iconName` | `string` | `'mdi:phone-outline'` | Icône Iconify (chaîne vide pour masquer) |
|
||||||
| `iconPosition` | `'left' \| 'right'` | `'left'` | Position de l'icône |
|
| `iconPosition` | `'left' \| 'right'` | `'left'` | Position de l'icône |
|
||||||
| `iconSize` | `string \| number` | `24` | Taille icône |
|
| `iconSize` | `string \| number` | `24` | Taille icône |
|
||||||
@@ -156,7 +146,7 @@ Champ téléphone (`type="tel"` + `inputmode="tel"`) avec icône `mdi:phone-outl
|
|||||||
|
|
||||||
## MalioInputAutocomplete
|
## MalioInputAutocomplete
|
||||||
|
|
||||||
Champ de saisie assistée (typeahead / combobox) : l'utilisateur tape pour filtrer une liste d'options, ou pour déclencher une recherche côté parent (API). Par défaut le parent alimente `options` et `loading` en réponse à l'event `search` — c'est lui qui gère l'appel API, l'auth, la transformation et le cache. Pour une liste **statique** courte, activer `localFilter` fait filtrer le composant lui-même (case-insensitive `label.includes(query)`) sans avoir à brancher `@search`.
|
Champ de saisie assistée (typeahead / combobox) : l'utilisateur tape pour filtrer une liste d'options, ou pour déclencher une recherche côté parent (API). Le parent alimente `options` et `loading` en réponse à l'event `search` — c'est lui qui gère l'appel API, l'auth, la transformation et le cache.
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
| Prop | Type | Défaut | Description |
|
||||||
|------|------|--------|-------------|
|
|------|------|--------|-------------|
|
||||||
@@ -169,7 +159,6 @@ Champ de saisie assistée (typeahead / combobox) : l'utilisateur tape pour filtr
|
|||||||
| `debounce` | `number` | `300` | Délai (ms) avant émission de `search` |
|
| `debounce` | `number` | `300` | Délai (ms) avant émission de `search` |
|
||||||
| `minSearchLength` | `number` | `0` | Caractères mini avant d'émettre `search` |
|
| `minSearchLength` | `number` | `0` | Caractères mini avant d'émettre `search` |
|
||||||
| `allowCreate` | `boolean` | `false` | Autorise la saisie libre validée par Entrée (émet `create`) |
|
| `allowCreate` | `boolean` | `false` | Autorise la saisie libre validée par Entrée (émet `create`) |
|
||||||
| `localFilter` | `boolean` | `false` | Filtre `options` côté client par sous-chaîne du label (case-insensitive). À utiliser pour les listes statiques courtes ; en mode API on laisse `false` et le parent répond à `@search`. |
|
|
||||||
| `iconName` | `string` | `''` | Icône Iconify décorative |
|
| `iconName` | `string` | `''` | Icône Iconify décorative |
|
||||||
| `iconPosition` | `'left' \| 'right'` | `'left'` | Position de l'icône décorative |
|
| `iconPosition` | `'left' \| 'right'` | `'left'` | Position de l'icône décorative |
|
||||||
| `iconSize` | `string \| number` | `24` | Taille de l'icône |
|
| `iconSize` | `string \| number` | `24` | Taille de l'icône |
|
||||||
@@ -179,11 +168,10 @@ Champ de saisie assistée (typeahead / combobox) : l'utilisateur tape pour filtr
|
|||||||
| `minSearchText` | `string` | `'Tapez pour rechercher'` | Texte affiché tant que `minSearchLength` n'est pas atteint |
|
| `minSearchText` | `string` | `'Tapez pour rechercher'` | Texte affiché tant que `minSearchLength` n'est pas atteint |
|
||||||
| `disabled` | `boolean` | `false` | Désactive le champ et empêche l'ouverture |
|
| `disabled` | `boolean` | `false` | Désactive le champ et empêche l'ouverture |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule (n'ouvre pas le dropdown) |
|
| `readonly` | `boolean` | `false` | Lecture seule (n'ouvre pas le dropdown) |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
| `required` | `boolean` | `false` | Champ requis |
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur (prioritaire) |
|
| `error` | `string` | `''` | Message d'erreur (prioritaire) |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` | `string` | `''` | Classes CSS input |
|
| `inputClass` | `string` | `''` | Classes CSS input |
|
||||||
| `labelClass` | `string` | `''` | Classes CSS label |
|
| `labelClass` | `string` | `''` | Classes CSS label |
|
||||||
| `groupClass` | `string` | `''` | Classes CSS conteneur |
|
| `groupClass` | `string` | `''` | Classes CSS conteneur |
|
||||||
@@ -197,8 +185,8 @@ Champ de saisie assistée (typeahead / combobox) : l'utilisateur tape pour filtr
|
|||||||
**Clavier :** `↓` / `↑` navigation, `Entrée` sélection (ou création), `Échap` ferme le dropdown.
|
**Clavier :** `↓` / `↑` navigation, `Entrée` sélection (ou création), `Échap` ferme le dropdown.
|
||||||
|
|
||||||
```vue
|
```vue
|
||||||
<!-- Usage statique (filtrage côté client via local-filter) -->
|
<!-- Usage statique -->
|
||||||
<MalioInputAutocomplete v-model="country" label="Pays" :options="countries" local-filter />
|
<MalioInputAutocomplete v-model="country" label="Pays" :options="countries" />
|
||||||
|
|
||||||
<!-- Usage API (parent gère le fetch) -->
|
<!-- Usage API (parent gère le fetch) -->
|
||||||
<MalioInputAutocomplete
|
<MalioInputAutocomplete
|
||||||
@@ -242,9 +230,7 @@ Champ montant avec icône devise (euro par défaut).
|
|||||||
| `label` | `string` | `''` | Label |
|
| `label` | `string` | `''` | Label |
|
||||||
| `iconName` | `string` | `'mdi:currency-eur'` | Icône devise |
|
| `iconName` | `string` | `'mdi:currency-eur'` | Icône devise |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
|
|
||||||
@@ -266,9 +252,7 @@ Champ numérique avec boutons +/-.
|
|||||||
| `min` | `number \| string` | — | Valeur minimum |
|
| `min` | `number \| string` | — | Valeur minimum |
|
||||||
| `max` | `number \| string` | — | Valeur maximum |
|
| `max` | `number \| string` | — | Valeur maximum |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
|
|
||||||
@@ -291,9 +275,7 @@ Zone de texte multiligne avec compteur et redimensionnement.
|
|||||||
| `maxLength` | `number` | `800` | Longueur max |
|
| `maxLength` | `number` | `800` | Longueur max |
|
||||||
| `showCounter` | `boolean` | `false` | Afficher le compteur |
|
| `showCounter` | `boolean` | `false` | Afficher le compteur |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `groupClass` | `string` | `''` | Classes CSS sur la div conteneur (utile pour `row-span-*`, `col-span-*`, etc.) |
|
| `groupClass` | `string` | `''` | Classes CSS sur la div conteneur (utile pour `row-span-*`, `col-span-*`, etc.) |
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
@@ -321,11 +303,9 @@ Zone de texte multiligne avec compteur et redimensionnement.
|
|||||||
| `editable` | `boolean` | `true` | `false` → mode affichage seul (toolbar masquée) |
|
| `editable` | `boolean` | `true` | `false` → mode affichage seul (toolbar masquée) |
|
||||||
| `disabled` | `boolean` | `false` | Désactive l'édition et la toolbar |
|
| `disabled` | `boolean` | `false` | Désactive l'édition et la toolbar |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule (toolbar visible mais désactivée) |
|
| `readonly` | `boolean` | `false` | Lecture seule (toolbar visible mais désactivée) |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `outputFormat` | `'markdown' \| 'html'` | `'html'` | Format émis dans `update:modelValue` |
|
| `outputFormat` | `'markdown' \| 'html'` | `'html'` | Format émis dans `update:modelValue` |
|
||||||
| `groupClass` | `string` | `''` | Classes CSS conteneur (twMerge) |
|
| `groupClass` | `string` | `''` | Classes CSS conteneur (twMerge) |
|
||||||
| `labelClass` | `string` | `''` | Classes CSS label (twMerge) |
|
| `labelClass` | `string` | `''` | Classes CSS label (twMerge) |
|
||||||
@@ -353,10 +333,7 @@ Champ d'upload de fichier.
|
|||||||
| `accept` | `string` | `''` | Types de fichiers acceptés |
|
| `accept` | `string` | `''` | Types de fichiers acceptés |
|
||||||
| `displayIcon` | `boolean` | `true` | Afficher l'icône |
|
| `displayIcon` | `boolean` | `true` | Afficher l'icône |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Champ en lecture seule (bordure noire, pas de focus bleu/grossissement, label/icône gris→noir selon rempli). |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`, `file-selected(file: File)`
|
**Events :** `update:modelValue(value: string)`, `file-selected(file: File)`
|
||||||
|
|
||||||
@@ -379,10 +356,7 @@ Liste déroulante.
|
|||||||
| `hint` | `string` | `''` | Message d'aide |
|
| `hint` | `string` | `''` | Message d'aide |
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `success` | `string` | `''` | Message de succès |
|
| `success` | `string` | `''` | Message de succès |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Champ en lecture seule (bordure noire, pas de focus bleu/grossissement, label/icône gris→noir selon rempli). |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `groupClass` | `string` | `''` | Classes CSS conteneur (twMerge) |
|
| `groupClass` | `string` | `''` | Classes CSS conteneur (twMerge) |
|
||||||
| `rounded` | `string` | `'rounded-md'` | Classe border-radius |
|
| `rounded` | `string` | `'rounded-md'` | Classe border-radius |
|
||||||
| `textField` | `string` | `'text-lg'` | Classe taille texte bouton |
|
| `textField` | `string` | `'text-lg'` | Classe taille texte bouton |
|
||||||
@@ -407,16 +381,13 @@ Liste déroulante multi-sélection avec checkboxes.
|
|||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
| Prop | Type | Défaut | Description |
|
||||||
|------|------|--------|-------------|
|
|------|------|--------|-------------|
|
||||||
| `modelValue` | `(string \| number)[]` | `[]` | Valeurs sélectionnées (v-model) |
|
| `modelValue` | `(string \| number)[]` | **requis** | Valeurs sélectionnées (v-model) |
|
||||||
| `options` | `{ value: string \| number, text: string }[]` | `[]` | Options |
|
| `options` | `{ value: string \| number, text: string }[]` | `[]` | Options |
|
||||||
| `displayTag` | `boolean` | `false` | Afficher les tags sélectionnés |
|
| `displayTag` | `boolean` | `false` | Afficher les tags sélectionnés |
|
||||||
| `displaySelectAll` | `boolean` | `false` | Afficher "Tout sélectionner" |
|
| `displaySelectAll` | `boolean` | `false` | Afficher "Tout sélectionner" |
|
||||||
| `selectAllLabel` | `string` | `'Tout sélectionner'` | Texte du sélecteur global |
|
| `selectAllLabel` | `string` | `'Tout sélectionner'` | Texte du sélecteur global |
|
||||||
| `label` | `string` | `''` | Label |
|
| `label` | `string` | `''` | Label |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Champ en lecture seule (bordure noire, pas de focus bleu/grossissement, label/icône gris→noir selon rempli). |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `noOptionsText` | `string` | `'Aucune option disponible'` | Message affiché dans la dropdown quand `options` est vide |
|
| `noOptionsText` | `string` | `'Aucune option disponible'` | Message affiché dans la dropdown quand `options` est vide |
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: (string | number)[])`
|
**Events :** `update:modelValue(value: (string | number)[])`
|
||||||
@@ -438,9 +409,7 @@ Case à cocher.
|
|||||||
| `label` | `string` | `''` | Label |
|
| `label` | `string` | `''` | Label |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: boolean)`
|
**Events :** `update:modelValue(value: boolean)`
|
||||||
|
|
||||||
@@ -463,7 +432,6 @@ Bouton radio (à utiliser en groupe avec le même `name`).
|
|||||||
| `name` | `string` | `''` | Nom du groupe radio |
|
| `name` | `string` | `''` | Nom du groupe radio |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | number | boolean | null)`
|
**Events :** `update:modelValue(value: string | number | boolean | null)`
|
||||||
|
|
||||||
@@ -474,109 +442,6 @@ Bouton radio (à utiliser en groupe avec le même `name`).
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioDate
|
|
||||||
|
|
||||||
Sélecteur de date unique avec popover (grille de calendrier + vue mois/année).
|
|
||||||
|
|
||||||
La valeur est une chaîne ISO `"YYYY-MM-DD"`. Cliquer un jour émet la date et ferme le popover.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `modelValue` | `string \| null` | `undefined` | Date ISO `"YYYY-MM-DD"` (v-model) |
|
|
||||||
| `id` | `string` | `''` | Id du champ |
|
|
||||||
| `name` | `string` | `''` | Attribut name |
|
|
||||||
| `label` | `string` | `''` | Label flottant |
|
|
||||||
| `placeholder` | `string` | `'JJ/MM/AAAA'` | Placeholder |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
|
||||||
| `hint` | `string` | `''` | Texte d'aide |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
|
||||||
| `success` | `string` | `''` | Message de succès |
|
|
||||||
| `min` | `string` | `undefined` | Date min `"YYYY-MM-DD"` (jours antérieurs désactivés) |
|
|
||||||
| `max` | `string` | `undefined` | Date max `"YYYY-MM-DD"` (jours postérieurs désactivés) |
|
|
||||||
| `clearable` | `boolean` | `true` | Affiche la croix d'effacement |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | Override des classes |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | null)`
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioDate v-model="date" label="Date de naissance" />
|
|
||||||
<!-- date === "2026-05-20" -->
|
|
||||||
<MalioDate v-model="rdv" label="Rendez-vous" :min="todayIso" :max="maxIso" />
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioDateRange
|
|
||||||
|
|
||||||
Sélecteur de **plage de dates** (date de début → date de fin) dans un seul champ. Cliquer un premier jour démarre la plage, le second la termine ; un survol prévisualise la plage.
|
|
||||||
|
|
||||||
La valeur est un objet `{ start: string; end: string }` (dates ISO `"YYYY-MM-DD"`), ou `null`.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `modelValue` | `{ start: string; end: string } \| null` | `undefined` | Plage de dates ISO (v-model) |
|
|
||||||
| `id` | `string` | `''` | Id du champ |
|
|
||||||
| `name` | `string` | `''` | Attribut name |
|
|
||||||
| `label` | `string` | `''` | Label flottant |
|
|
||||||
| `placeholder` | `string` | `'JJ/MM/AAAA'` | Placeholder |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
|
||||||
| `hint` | `string` | `''` | Texte d'aide |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
|
||||||
| `success` | `string` | `''` | Message de succès |
|
|
||||||
| `min` | `string` | `undefined` | Date min `"YYYY-MM-DD"` |
|
|
||||||
| `max` | `string` | `undefined` | Date max `"YYYY-MM-DD"` |
|
|
||||||
| `clearable` | `boolean` | `true` | Affiche la croix d'effacement |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | Override des classes |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: { start: string; end: string } | null)`
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioDateRange v-model="periode" label="Période de séjour" />
|
|
||||||
<!-- periode === { start: "2026-05-20", end: "2026-05-27" } -->
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioDateWeek
|
|
||||||
|
|
||||||
Sélecteur de **semaine ISO** : cliquer un jour (ou un numéro de semaine) sélectionne la semaine entière.
|
|
||||||
|
|
||||||
La valeur est une chaîne au format **semaine ISO native** `"YYYY-Www"` (ex. `"2026-W21"`), ou `null`. Le champ affiche `Semaine W (JJ/MM → JJ/MM/AAAA)`.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `modelValue` | `string \| null` | `undefined` | Semaine ISO `"YYYY-Www"` (v-model) |
|
|
||||||
| `id` | `string` | `''` | Id du champ |
|
|
||||||
| `name` | `string` | `''` | Attribut name |
|
|
||||||
| `label` | `string` | `''` | Label flottant |
|
|
||||||
| `placeholder` | `string` | `'JJ/MM/AAAA'` | Placeholder |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
|
||||||
| `hint` | `string` | `''` | Texte d'aide |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
|
||||||
| `success` | `string` | `''` | Message de succès |
|
|
||||||
| `min` | `string` | `undefined` | Date min `"YYYY-MM-DD"` |
|
|
||||||
| `max` | `string` | `undefined` | Date max `"YYYY-MM-DD"` |
|
|
||||||
| `clearable` | `boolean` | `true` | Affiche la croix d'effacement |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | Override des classes |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | null)`
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioDateWeek v-model="semaine" label="Semaine de livraison" />
|
|
||||||
<!-- semaine === "2026-W21" -->
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioTime
|
## MalioTime
|
||||||
|
|
||||||
Sélecteur d'heure.
|
Sélecteur d'heure.
|
||||||
@@ -587,9 +452,7 @@ Sélecteur d'heure.
|
|||||||
| `label` | `string` | `''` | Label |
|
| `label` | `string` | `''` | Label |
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
| `disabled` | `boolean` | `false` | Désactivé |
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
| `readonly` | `boolean` | `false` | Lecture seule |
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
| `error` | `string` | `''` | Message d'erreur |
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string)`
|
**Events :** `update:modelValue(value: string)`
|
||||||
|
|
||||||
@@ -600,74 +463,6 @@ Sélecteur d'heure.
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioTimePicker
|
|
||||||
|
|
||||||
Sélecteur d'heure à **molettes style iOS** (champ + popover). Deux colonnes infinies (heures `00–23`, minutes `00–59`, pas de 1) avec une bande de sélection centrale ; la valeur centrée est sélectionnée. Défilement, clic sur une valeur (recentrage) ou flèches clavier (`role="spinbutton"`). Pour une saisie clavier directe au format texte, voir plutôt `MalioTime`.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `id` | `string` | auto | Identifiant HTML |
|
|
||||||
| `name` | `string` | `''` | Attribut name |
|
|
||||||
| `label` | `string` | `''` | Label flottant |
|
|
||||||
| `modelValue` | `string \| null` | `undefined` | Heure au format `"HH:MM"` (v-model) |
|
|
||||||
| `placeholder` | `string` | `'HH:MM'` | Placeholder |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactive le champ |
|
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
|
||||||
| `clearable` | `boolean` | `true` | Affiche la croix d'effacement |
|
|
||||||
| `hint` | `string` | `''` | Message d'aide |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
|
||||||
| `success` | `string` | `''` | Message de succès |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | Override des classes |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | null)`
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioTimePicker v-model="heure" label="Heure" />
|
|
||||||
<MalioTimePicker v-model="heure" label="Départ" hint="Format HH:MM" />
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioDateTime
|
|
||||||
|
|
||||||
Champ unique combinant **date et heure** dans un popover (grille de calendrier + sélecteur d'heure sous la grille).
|
|
||||||
|
|
||||||
> Depuis MUI-39, le réglage de l'heure utilise le sélecteur à molettes (cf. `MalioTimePicker`), qui remplace l'ancien `<input type="time">` natif intérimaire.
|
|
||||||
|
|
||||||
La valeur est une chaîne **ISO naïve sans fuseau** au format `"YYYY-MM-DDTHH:MM:00"` (heure murale locale). Symfony (`DateTimeNormalizer`) parse ce format et applique son fuseau configuré côté back — pas de gestion de fuseau côté front.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `modelValue` | `string \| null` | `undefined` | Date + heure ISO naïve `"YYYY-MM-DDTHH:MM:00"` (v-model) |
|
|
||||||
| `id` | `string` | `''` | Id du champ |
|
|
||||||
| `name` | `string` | `''` | Attribut name |
|
|
||||||
| `label` | `string` | `''` | Label flottant |
|
|
||||||
| `placeholder` | `string` | `'JJ/MM/AAAA HH:MM'` | Placeholder |
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (astérisque rouge dans le label) |
|
|
||||||
| `disabled` | `boolean` | `false` | Désactivé |
|
|
||||||
| `readonly` | `boolean` | `false` | Lecture seule |
|
|
||||||
| `hint` | `string` | `''` | Texte d'aide |
|
|
||||||
| `error` | `string` | `''` | Message d'erreur |
|
|
||||||
| `success` | `string` | `''` | Message de succès |
|
|
||||||
| `min` | `string` | `undefined` | Borne min (datetime ou date ; borne la grille sur la partie date) |
|
|
||||||
| `max` | `string` | `undefined` | Borne max (idem) |
|
|
||||||
| `clearable` | `boolean` | `true` | Affiche la croix d'effacement |
|
|
||||||
| `reserveMessageSpace` | `boolean` | `true` | Réserve l'espace de la ligne message sous le champ (min-h) même sans message. `false` = la ligne ne prend de place que s'il y a un hint/error/success. |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | Override des classes |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | null)`
|
|
||||||
|
|
||||||
Flux : cliquer un jour fixe la date (heure par défaut `00:00`), régler l'heure met à jour l'heure ; le popover se ferme au clic extérieur. La valeur est émise en direct à chaque interaction.
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioDateTime v-model="rdv" label="Date et heure du rendez-vous" />
|
|
||||||
<!-- rdv === "2026-05-20T14:30:00" -->
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioButton
|
## MalioButton
|
||||||
|
|
||||||
Bouton d'action avec 4 variantes visuelles et icône optionnelle.
|
Bouton d'action avec 4 variantes visuelles et icône optionnelle.
|
||||||
@@ -691,11 +486,8 @@ Bouton d'action avec 4 variantes visuelles et icône optionnelle.
|
|||||||
<MalioButton label="Voir plus" variant="tertiary" />
|
<MalioButton label="Voir plus" variant="tertiary" />
|
||||||
<MalioButton label="Supprimer" variant="danger" icon-name="mdi:trash" icon-position="left" />
|
<MalioButton label="Supprimer" variant="danger" icon-name="mdi:trash" icon-position="left" />
|
||||||
<MalioButton label="Pleine largeur" button-class="w-full" />
|
<MalioButton label="Pleine largeur" button-class="w-full" />
|
||||||
<MalioButton label="Modifier" button-class="w-m-btn-action" /> <!-- 150px, format bouton d'action -->
|
|
||||||
```
|
```
|
||||||
|
|
||||||
> **Token de largeur partagé** : `w-m-btn-action` (150px) est exposé via `tailwind.config.ts` du layer, branché sur la CSS var `--m-btn-action-width`. Pour les boutons d'action (listes, lignes de tableau, footers denses…). Themable côté consommateur en redéfinissant `--m-btn-action-width` dans son propre CSS.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioButtonIcon
|
## MalioButtonIcon
|
||||||
@@ -728,10 +520,6 @@ Navigation par onglets avec contenu dynamique.
|
|||||||
|------|------|--------|-------------|
|
|------|------|--------|-------------|
|
||||||
| `modelValue` | `string` | `undefined` | Onglet actif (v-model) |
|
| `modelValue` | `string` | `undefined` | Onglet actif (v-model) |
|
||||||
| `tabs` | `Tab[]` | **requis** | Liste des onglets (voir type ci-dessous) |
|
| `tabs` | `Tab[]` | **requis** | Liste des onglets (voir type ci-dessous) |
|
||||||
| `maxVisibleTabs` | `number` | `undefined` | Nombre max d'onglets affichés à la fois. Au-delà, un carrousel avec flèches gauche/droite apparaît (décalage 1 par 1). Non défini = tous les onglets. |
|
|
||||||
| `maxWidth` | `number` | `1100` | Largeur max (px) du bloc d'onglets en mode fenêtré. |
|
|
||||||
|
|
||||||
Quand `maxVisibleTabs` est défini et que le nombre d'onglets le dépasse, la barre passe en mode fenêtré : seuls `maxVisibleTabs` onglets sont visibles à la fois, encadrés par des flèches gauche/droite qui font défiler la fenêtre un onglet à la fois (largeur du bloc bornée par `maxWidth`).
|
|
||||||
|
|
||||||
Type `Tab` :
|
Type `Tab` :
|
||||||
|
|
||||||
@@ -769,54 +557,6 @@ const tabs = computed(() => [
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioAccordion
|
|
||||||
|
|
||||||
Accordéon compositionnel : `<MalioAccordion>` enveloppe des `<MalioAccordionItem>`. Plusieurs panneaux ouverts (`multiple`, défaut) ou un seul (`single`). Pensé pour les filtres en drawer et les FAQ.
|
|
||||||
|
|
||||||
### MalioAccordion
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `mode` | `'single' \| 'multiple'` | `'multiple'` | Un seul ou plusieurs panneaux ouverts |
|
|
||||||
| `modelValue` | `string \| string[]` | `undefined` | Clés ouvertes (v-model). `string[]` en `multiple`, `string` en `single` |
|
|
||||||
| `id` | `string` | auto | Préfixe des IDs d'accessibilité |
|
|
||||||
| `groupClass` | `string` | `''` | Classes du conteneur (twMerge) |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | string[])`
|
|
||||||
|
|
||||||
### MalioAccordionItem
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `title` | `string` | — | Texte de l'en-tête |
|
|
||||||
| `value` | `string` | auto | Clé unique de la section |
|
|
||||||
| `defaultOpen` | `boolean` | `false` | Ouvert au montage (mode non contrôlé) |
|
|
||||||
| `disabled` | `boolean` | `false` | En-tête non cliquable |
|
|
||||||
| `headerClass` | `string` | `''` | Override classes en-tête (twMerge) |
|
|
||||||
| `panelClass` | `string` | `''` | Override classes panneau (twMerge) |
|
|
||||||
|
|
||||||
**Slot :** par défaut = contenu du panneau.
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<!-- Filtres : plusieurs sections ouvertes -->
|
|
||||||
<MalioAccordion v-model="ouverts">
|
|
||||||
<MalioAccordionItem title="Prix" value="prix">
|
|
||||||
<MalioInputAmount v-model="prix" />
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat">
|
|
||||||
<MalioCheckbox v-model="cats" />
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
|
|
||||||
<!-- FAQ : une seule section ouverte -->
|
|
||||||
<MalioAccordion mode="single">
|
|
||||||
<MalioAccordionItem title="Question 1" value="q1">Réponse 1</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Question 2" value="q2">Réponse 2</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioSidebar
|
## MalioSidebar
|
||||||
|
|
||||||
Barre latérale de navigation rétractable.
|
Barre latérale de navigation rétractable.
|
||||||
@@ -859,14 +599,14 @@ Panneau latéral (drawer) qui s'ouvre depuis la droite ou la gauche avec backdro
|
|||||||
| `overlayClass` | `string` | `''` | Classes CSS backdrop (twMerge) |
|
| `overlayClass` | `string` | `''` | Classes CSS backdrop (twMerge) |
|
||||||
| `headerClass` | `string` | `''` | Classes CSS barre header (twMerge) |
|
| `headerClass` | `string` | `''` | Classes CSS barre header (twMerge) |
|
||||||
| `bodyClass` | `string` | `''` | Classes CSS zone scrollable (twMerge) |
|
| `bodyClass` | `string` | `''` | Classes CSS zone scrollable (twMerge) |
|
||||||
| `footerClass` | `string` | `''` | Classes CSS du footer fixe (twMerge) |
|
| `footerClass` | `string` | `''` | Classes CSS wrapper du footer (aucune position imposée) |
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: boolean)`, `close()`
|
**Events :** `update:modelValue(value: boolean)`, `close()`
|
||||||
|
|
||||||
**Slots :**
|
**Slots :**
|
||||||
- `header` — en-tête (titre, etc.), fixe en haut. S'il est absent et que `showClose` est `true`, seule la croix est affichée.
|
- `header` — en-tête (titre, etc.). S'il est absent et que `showClose` est `true`, seule la croix est affichée.
|
||||||
- `default` — contenu (zone scrollable : seul le body défile).
|
- `default` — contenu (zone scrollable).
|
||||||
- `footer` — actions (boutons). Rendu en bas du panneau, fixe, hors de la zone scrollable. N'apparaît que si le slot est fourni.
|
- `footer` — rendu dans la zone scrollable, sans positionnement imposé : le consommateur choisit (`sticky bottom-0`, `fixed`, ou rien).
|
||||||
|
|
||||||
```vue
|
```vue
|
||||||
<MalioDrawer v-model="isOpen">
|
<MalioDrawer v-model="isOpen">
|
||||||
@@ -882,12 +622,14 @@ Panneau latéral (drawer) qui s'ouvre depuis la droite ou la gauche avec backdro
|
|||||||
<p>Drawer large depuis la gauche</p>
|
<p>Drawer large depuis la gauche</p>
|
||||||
</MalioDrawer>
|
</MalioDrawer>
|
||||||
|
|
||||||
<!-- Footer d'actions (fixe en bas, hors zone scrollable) -->
|
<!-- Footer collé en bas (le consommateur applique le positionnement) -->
|
||||||
<MalioDrawer v-model="isOpen">
|
<MalioDrawer v-model="isOpen">
|
||||||
<template #header><h2>Formulaire</h2></template>
|
<template #header><h2>Formulaire</h2></template>
|
||||||
<MalioInputText label="Nom" />
|
<MalioInputText label="Nom" />
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<div class="sticky bottom-0 bg-white py-4">
|
||||||
<MalioButton label="Enregistrer" button-class="w-full" @click="isOpen = false" />
|
<MalioButton label="Enregistrer" button-class="w-full" @click="isOpen = false" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</MalioDrawer>
|
</MalioDrawer>
|
||||||
|
|
||||||
@@ -900,58 +642,6 @@ Panneau latéral (drawer) qui s'ouvre depuis la droite ou la gauche avec backdro
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## MalioModal
|
|
||||||
|
|
||||||
Boîte de dialogue modale centrée avec backdrop semi-transparent. Gère l'accessibilité (focus-trap, restitution du focus, `Échap`), le verrouillage du scroll de la page et un empilement correct de plusieurs modals. Structure : header fixe, body scrollable (`max-h-[85vh]`), footer fixe.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `id` | `string` | auto | Identifiant HTML |
|
|
||||||
| `modelValue` | `boolean` | `undefined` | État ouvert/fermé (v-model) |
|
|
||||||
| `showClose` | `boolean` | `true` | Afficher le bouton de fermeture (croix) |
|
|
||||||
| `dismissable` | `boolean` | `true` | Fermer au clic sur le backdrop |
|
|
||||||
| `closeOnEscape` | `boolean` | `true` | Fermer avec la touche `Échap` |
|
|
||||||
| `ariaLabel` | `string` | `''` | Nom accessible de secours quand le slot `#header` est absent |
|
|
||||||
| `modalClass` | `string` | `''` | Classes CSS panneau, ex. largeur `max-w-lg` (twMerge) |
|
|
||||||
| `overlayClass` | `string` | `''` | Classes CSS backdrop (twMerge) |
|
|
||||||
| `headerClass` | `string` | `''` | Classes CSS barre header (twMerge) |
|
|
||||||
| `bodyClass` | `string` | `''` | Classes CSS zone scrollable (twMerge) |
|
|
||||||
| `footerClass` | `string` | `''` | Classes CSS footer fixe (twMerge) |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: boolean)`, `close()`
|
|
||||||
|
|
||||||
**Slots :**
|
|
||||||
- `header` — en-tête (titre, etc.). S'il est absent et que `showClose` est `true`, seule la croix est affichée.
|
|
||||||
- `default` — contenu (zone scrollable).
|
|
||||||
- `footer` — actions (boutons). Rendu en bas, fixe, séparé par une bordure. N'apparaît que si le slot est fourni.
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioModal v-model="isOpen">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold">Détails</h2>
|
|
||||||
</template>
|
|
||||||
<p>Contenu de la modal</p>
|
|
||||||
</MalioModal>
|
|
||||||
|
|
||||||
<!-- Largeur custom + footer d'actions -->
|
|
||||||
<MalioModal v-model="isOpen" modal-class="max-w-lg">
|
|
||||||
<template #header><h2>Nouveau contact</h2></template>
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="isOpen = false" />
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="isOpen = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
|
|
||||||
<!-- Non fermable au backdrop / Échap (croix uniquement) -->
|
|
||||||
<MalioModal v-model="isOpen" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header><h2>Action requise</h2></template>
|
|
||||||
<p>Fermeture via la croix uniquement</p>
|
|
||||||
</MalioModal>
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioDataTable
|
## MalioDataTable
|
||||||
|
|
||||||
Tableau de données presentational avec pagination, filtres par slots et lignes cliquables.
|
Tableau de données presentational avec pagination, filtres par slots et lignes cliquables.
|
||||||
@@ -1005,33 +695,3 @@ Tableau de données presentational avec pagination, filtres par slots et lignes
|
|||||||
v-model:per-page="perPage"
|
v-model:per-page="perPage"
|
||||||
/>
|
/>
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## MalioSiteSelector
|
|
||||||
|
|
||||||
Sélecteur de site sous forme de tuiles segmentées (`role="radiogroup"`). Chaque site occupe une tuile de largeur égale ; la tuile active s'affiche pleine opacité dans sa couleur (`site.color`), les autres sont atténuées. Pattern contrôlé (`v-model`) ou non contrôlé (premier site sélectionné par défaut).
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `sites` | `{ id: string, name: string, color: string }[]` | **requis** | Liste des sites (la `color` colore la tuile active) |
|
|
||||||
| `modelValue` | `string` | `undefined` | `id` du site sélectionné (v-model) |
|
|
||||||
| `id` | `string` | auto | Identifiant HTML du conteneur |
|
|
||||||
| `groupClass` | `string` | `''` | Classes CSS du conteneur (twMerge) |
|
|
||||||
| `tileClass` | `string` | `''` | Classes CSS de chaque tuile (twMerge) |
|
|
||||||
| `labelClass` | `string` | `''` | Classes CSS du label de tuile (twMerge) |
|
|
||||||
|
|
||||||
**Events :**
|
|
||||||
- `update:modelValue(value: string)` — `id` du site sélectionné (v-model)
|
|
||||||
- `change(site: Site)` — émis avec l'objet site complet sélectionné
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioSiteSelector
|
|
||||||
v-model="siteId"
|
|
||||||
:sites="[
|
|
||||||
{ id: 'paris', name: 'Paris', color: '#2563eb' },
|
|
||||||
{ id: 'lyon', name: 'Lyon', color: '#16a34a' },
|
|
||||||
]"
|
|
||||||
@change="onSiteChange"
|
|
||||||
/>
|
|
||||||
```
|
|
||||||
|
|||||||
@@ -31,9 +31,6 @@
|
|||||||
--m-btn-danger-hover: 234 151 151; /* #EA9797 */
|
--m-btn-danger-hover: 234 151 151; /* #EA9797 */
|
||||||
--m-btn-danger-active: 255 83 86; /* #FF5356 */
|
--m-btn-danger-active: 255 83 86; /* #FF5356 */
|
||||||
|
|
||||||
/* ── Largeurs Boutons ── */
|
|
||||||
--m-btn-action-width: 150px; /* Boutons d'action (liste, ligne tableau, footer dense…) */
|
|
||||||
|
|
||||||
/* ── Couleurs de site (usage ponctuel) ── */
|
/* ── Couleurs de site (usage ponctuel) ── */
|
||||||
--m-site-blue: 5 108 242; /* #056CF2 - Bleu Châtellerault */
|
--m-site-blue: 5 108 242; /* #056CF2 - Bleu Châtellerault */
|
||||||
--m-site-yellow: 243 203 0; /* #F3CB00 - Jaune Saint-Jean */
|
--m-site-yellow: 243 203 0; /* #F3CB00 - Jaune Saint-Jean */
|
||||||
|
|||||||
@@ -1,256 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import {nextTick} from 'vue'
|
|
||||||
import Accordion from './Accordion.vue'
|
|
||||||
import AccordionItem from './AccordionItem.vue'
|
|
||||||
|
|
||||||
const TWO_ITEMS = `
|
|
||||||
<MalioAccordionItem title="Prix" value="prix"><p>Contenu prix</p></MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat"><p>Contenu catégorie</p></MalioAccordionItem>
|
|
||||||
`
|
|
||||||
|
|
||||||
function mountAccordion(props: Record<string, unknown> = {}, slot: string = TWO_ITEMS, attachTo?: HTMLElement) {
|
|
||||||
return mount(Accordion, {
|
|
||||||
props,
|
|
||||||
slots: {default: slot},
|
|
||||||
attachTo,
|
|
||||||
global: {components: {MalioAccordionItem: AccordionItem}},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('MalioAccordion — rendu & mode multiple', () => {
|
|
||||||
it('renders each item header with its title', () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers).toHaveLength(2)
|
|
||||||
expect(headers[0].text()).toContain('Prix')
|
|
||||||
expect(headers[1].text()).toContain('Catégorie')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the slot content of each panel', () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
expect(wrapper.html()).toContain('Contenu prix')
|
|
||||||
expect(wrapper.html()).toContain('Contenu catégorie')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('all panels are collapsed by default', () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('false')
|
|
||||||
const regions = wrapper.findAll('[role="region"]')
|
|
||||||
expect(regions[0].classes()).toContain('grid-rows-[0fr]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('opens a panel on header click (multiple mode is default)', async () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('true')
|
|
||||||
const regions = wrapper.findAll('[role="region"]')
|
|
||||||
expect(regions[0].classes()).toContain('grid-rows-[1fr]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps multiple panels open simultaneously in multiple mode', async () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
await headers[1].trigger('click')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('true')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('closes an open panel when its header is clicked again', async () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wires aria-controls / aria-labelledby / role=region correctly', () => {
|
|
||||||
const wrapper = mountAccordion({id: 'acc'})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
const regions = wrapper.findAll('[role="region"]')
|
|
||||||
expect(headers[0].attributes('id')).toBe('acc-header-prix')
|
|
||||||
expect(headers[0].attributes('aria-controls')).toBe('acc-panel-prix')
|
|
||||||
expect(regions[0].attributes('id')).toBe('acc-panel-prix')
|
|
||||||
expect(regions[0].attributes('aria-labelledby')).toBe('acc-header-prix')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue with an array in multiple mode', async () => {
|
|
||||||
const wrapper = mountAccordion()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([['prix']])
|
|
||||||
await nextTick()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('MalioAccordion — mode single & contrôlé', () => {
|
|
||||||
it('opening a panel closes the others in single mode', async () => {
|
|
||||||
const wrapper = mountAccordion({mode: 'single'})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
await headers[1].trigger('click')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits a string in single mode', async () => {
|
|
||||||
const wrapper = mountAccordion({mode: 'single'})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[1].trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual(['cat'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits empty string when closing the open panel in single mode', async () => {
|
|
||||||
const wrapper = mountAccordion({mode: 'single', modelValue: 'prix'})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([''])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('respects modelValue array in controlled multiple mode', () => {
|
|
||||||
const wrapper = mountAccordion({modelValue: ['cat']})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('respects modelValue string in controlled single mode', () => {
|
|
||||||
const wrapper = mountAccordion({mode: 'single', modelValue: 'prix'})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('true')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('false')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not mutate local state in controlled mode (emits only)', async () => {
|
|
||||||
const wrapper = mountAccordion({modelValue: []})
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[0].trigger('click')
|
|
||||||
// état piloté par le parent : sans mise à jour de la prop, reste fermé
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([['prix']])
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('MalioAccordion — defaultOpen, disabled & clavier', () => {
|
|
||||||
const WITH_DEFAULT_OPEN = `
|
|
||||||
<MalioAccordionItem title="Prix" value="prix"><p>P</p></MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat" :default-open="true"><p>C</p></MalioAccordionItem>
|
|
||||||
`
|
|
||||||
const WITH_DISABLED = `
|
|
||||||
<MalioAccordionItem title="Prix" value="prix"><p>P</p></MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat" :disabled="true"><p>C</p></MalioAccordionItem>
|
|
||||||
`
|
|
||||||
|
|
||||||
it('opens defaultOpen items initially in uncontrolled mode', async () => {
|
|
||||||
const wrapper = mountAccordion({}, WITH_DEFAULT_OPEN)
|
|
||||||
await nextTick()
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers[0].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets disabled and aria-disabled on a disabled item', () => {
|
|
||||||
const wrapper = mountAccordion({}, WITH_DISABLED)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
expect(headers[1].attributes('disabled')).toBeDefined()
|
|
||||||
expect(headers[1].attributes('aria-disabled')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not toggle a disabled item on click', async () => {
|
|
||||||
const wrapper = mountAccordion({}, WITH_DISABLED)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
await headers[1].trigger('click')
|
|
||||||
expect(headers[1].attributes('aria-expanded')).toBe('false')
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('moves focus to the next header on ArrowDown', async () => {
|
|
||||||
const root = document.createElement('div')
|
|
||||||
document.body.appendChild(root)
|
|
||||||
const wrapper = mountAccordion({}, TWO_ITEMS, root)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
;(headers[0].element as HTMLElement).focus()
|
|
||||||
await headers[0].trigger('keydown', {key: 'ArrowDown'})
|
|
||||||
expect(document.activeElement).toBe(headers[1].element)
|
|
||||||
wrapper.unmount()
|
|
||||||
root.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wraps focus to the first header on ArrowDown from the last', async () => {
|
|
||||||
const root = document.createElement('div')
|
|
||||||
document.body.appendChild(root)
|
|
||||||
const wrapper = mountAccordion({}, TWO_ITEMS, root)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
;(headers[1].element as HTMLElement).focus()
|
|
||||||
await headers[1].trigger('keydown', {key: 'ArrowDown'})
|
|
||||||
expect(document.activeElement).toBe(headers[0].element)
|
|
||||||
wrapper.unmount()
|
|
||||||
root.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('moves focus to the previous header on ArrowUp', async () => {
|
|
||||||
const root = document.createElement('div')
|
|
||||||
document.body.appendChild(root)
|
|
||||||
const wrapper = mountAccordion({}, TWO_ITEMS, root)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
;(headers[1].element as HTMLElement).focus()
|
|
||||||
await headers[1].trigger('keydown', {key: 'ArrowUp'})
|
|
||||||
expect(document.activeElement).toBe(headers[0].element)
|
|
||||||
wrapper.unmount()
|
|
||||||
root.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('skips disabled headers during keyboard navigation', async () => {
|
|
||||||
const root = document.createElement('div')
|
|
||||||
document.body.appendChild(root)
|
|
||||||
const slot = `
|
|
||||||
<MalioAccordionItem title="A" value="a"><p>A</p></MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="B" value="b" :disabled="true"><p>B</p></MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="C" value="c"><p>C</p></MalioAccordionItem>
|
|
||||||
`
|
|
||||||
const wrapper = mountAccordion({}, slot, root)
|
|
||||||
const headers = wrapper.findAll('button[aria-expanded]')
|
|
||||||
;(headers[0].element as HTMLElement).focus()
|
|
||||||
await headers[0].trigger('keydown', {key: 'ArrowDown'})
|
|
||||||
// saute le header désactivé (B) pour aller directement à C
|
|
||||||
expect(document.activeElement).toBe(headers[2].element)
|
|
||||||
wrapper.unmount()
|
|
||||||
root.remove()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('MalioAccordion — overflow du panneau (popovers enfants)', () => {
|
|
||||||
const ONE = `<MalioAccordionItem title="A" value="a"><p>contenu</p></MalioAccordionItem>`
|
|
||||||
const ONE_OPEN = `<MalioAccordionItem title="A" value="a" :default-open="true"><p>contenu</p></MalioAccordionItem>`
|
|
||||||
|
|
||||||
it('clips the panel (overflow-hidden) while collapsed', () => {
|
|
||||||
const wrapper = mountAccordion({}, ONE)
|
|
||||||
const inner = wrapper.find('[role="region"] > div')
|
|
||||||
expect(inner.classes()).toContain('overflow-hidden')
|
|
||||||
expect(inner.classes()).not.toContain('overflow-visible')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('lets the panel overflow once open at mount (defaultOpen)', async () => {
|
|
||||||
const wrapper = mountAccordion({}, ONE_OPEN)
|
|
||||||
await nextTick()
|
|
||||||
expect(wrapper.find('[role="region"] > div').classes()).toContain('overflow-visible')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('switches to overflow-visible after the open transition ends', async () => {
|
|
||||||
const wrapper = mountAccordion({}, ONE)
|
|
||||||
await wrapper.find('button[aria-expanded]').trigger('click')
|
|
||||||
await wrapper.find('[role="region"]').trigger('transitionend', {propertyName: 'grid-template-rows'})
|
|
||||||
expect(wrapper.find('[role="region"] > div').classes()).toContain('overflow-visible')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('re-clips (overflow-hidden) as soon as it closes', async () => {
|
|
||||||
const wrapper = mountAccordion({}, ONE_OPEN)
|
|
||||||
await nextTick()
|
|
||||||
await wrapper.find('button[aria-expanded]').trigger('click')
|
|
||||||
expect(wrapper.find('[role="region"] > div').classes()).toContain('overflow-hidden')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-bind="$attrs" :class="rootClass">
|
|
||||||
<slot />
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, provide, ref, useId} from 'vue'
|
|
||||||
import {twMerge} from 'tailwind-merge'
|
|
||||||
import {accordionContextKey, type AccordionItemRegistration} from './context'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioAccordion', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
|
||||||
mode?: 'single' | 'multiple'
|
|
||||||
modelValue?: string | string[]
|
|
||||||
id?: string
|
|
||||||
groupClass?: string
|
|
||||||
}>(), {
|
|
||||||
mode: 'multiple',
|
|
||||||
modelValue: undefined,
|
|
||||||
id: '',
|
|
||||||
groupClass: '',
|
|
||||||
})
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(e: 'update:modelValue', value: string | string[]): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const generatedId = useId()
|
|
||||||
const baseId = computed(() => props.id || `malio-accordion-${generatedId}`)
|
|
||||||
const mode = computed(() => props.mode)
|
|
||||||
|
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
|
||||||
const localOpen = ref<string[]>([])
|
|
||||||
|
|
||||||
const items = ref<AccordionItemRegistration[]>([])
|
|
||||||
|
|
||||||
const openKeys = computed<string[]>(() => {
|
|
||||||
if (isControlled.value) {
|
|
||||||
const v = props.modelValue
|
|
||||||
if (props.mode === 'single') return v ? [v as string] : []
|
|
||||||
if (Array.isArray(v)) return v
|
|
||||||
return v ? [v as string] : []
|
|
||||||
}
|
|
||||||
return localOpen.value
|
|
||||||
})
|
|
||||||
|
|
||||||
function isOpen(value: string) {
|
|
||||||
return openKeys.value.includes(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggle(value: string) {
|
|
||||||
const current = openKeys.value
|
|
||||||
let next: string[]
|
|
||||||
if (props.mode === 'single') {
|
|
||||||
next = current.includes(value) ? [] : [value]
|
|
||||||
} else {
|
|
||||||
next = current.includes(value)
|
|
||||||
? current.filter(v => v !== value)
|
|
||||||
: [...current, value]
|
|
||||||
}
|
|
||||||
if (!isControlled.value) {
|
|
||||||
localOpen.value = next
|
|
||||||
}
|
|
||||||
emit('update:modelValue', props.mode === 'single' ? (next[0] ?? '') : next)
|
|
||||||
}
|
|
||||||
|
|
||||||
function register(item: AccordionItemRegistration, defaultOpen: boolean) {
|
|
||||||
items.value.push(item)
|
|
||||||
if (defaultOpen && !isControlled.value) {
|
|
||||||
if (props.mode === 'single') {
|
|
||||||
if (localOpen.value.length === 0) localOpen.value = [item.value]
|
|
||||||
} else if (!localOpen.value.includes(item.value)) {
|
|
||||||
localOpen.value.push(item.value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function unregister(value: string) {
|
|
||||||
items.value = items.value.filter(i => i.value !== value)
|
|
||||||
}
|
|
||||||
|
|
||||||
// `items` est ordonné par ordre de montage (= ordre du DOM pour des sections
|
|
||||||
// statiques/ajoutées en fin). Si un consommateur réordonne dynamiquement les
|
|
||||||
// items, cet ordre peut diverger de l'ordre visuel ; trier par position DOM
|
|
||||||
// serait alors nécessaire (hors périmètre v1).
|
|
||||||
function focusSibling(value: string, offset: 1 | -1) {
|
|
||||||
const enabled = items.value.filter(i => !i.isDisabled())
|
|
||||||
const idx = enabled.findIndex(i => i.value === value)
|
|
||||||
if (idx === -1) return
|
|
||||||
const next = enabled[(idx + offset + enabled.length) % enabled.length]
|
|
||||||
next?.getHeaderEl()?.focus()
|
|
||||||
}
|
|
||||||
|
|
||||||
const rootClass = computed(() =>
|
|
||||||
twMerge('divide-y divide-black border-y border-black', props.groupClass),
|
|
||||||
)
|
|
||||||
|
|
||||||
provide(accordionContextKey, {
|
|
||||||
mode,
|
|
||||||
baseId,
|
|
||||||
isOpen,
|
|
||||||
toggle,
|
|
||||||
register,
|
|
||||||
unregister,
|
|
||||||
focusSibling,
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
import {describe, expect, it, vi} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import Accordion from './Accordion.vue'
|
|
||||||
import AccordionItem from './AccordionItem.vue'
|
|
||||||
|
|
||||||
function mountInAccordion(slot: string, accordionProps: Record<string, unknown> = {}) {
|
|
||||||
return mount(Accordion, {
|
|
||||||
props: accordionProps,
|
|
||||||
slots: {default: slot},
|
|
||||||
global: {components: {MalioAccordionItem: AccordionItem}},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('MalioAccordionItem', () => {
|
|
||||||
it('throws when used outside MalioAccordion', () => {
|
|
||||||
const spy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
|
||||||
expect(() => mount(AccordionItem, {props: {title: 'Solo'}})).toThrow(
|
|
||||||
/à l'intérieur de MalioAccordion/,
|
|
||||||
)
|
|
||||||
spy.mockRestore()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('generates an auto id-based value and still toggles when value prop is omitted', async () => {
|
|
||||||
const wrapper = mountInAccordion(
|
|
||||||
`<MalioAccordionItem title="Sans value"><p>X</p></MalioAccordionItem>`,
|
|
||||||
)
|
|
||||||
const header = wrapper.find('button[aria-expanded]')
|
|
||||||
expect(header.attributes('aria-controls')).toMatch(/-panel-malio-accordion-item-/)
|
|
||||||
await header.trigger('click')
|
|
||||||
expect(header.attributes('aria-expanded')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies headerClass and panelClass overrides via twMerge', () => {
|
|
||||||
const wrapper = mountInAccordion(
|
|
||||||
`<MalioAccordionItem title="T" value="t" header-class="bg-red-500" panel-class="text-lg"><p>X</p></MalioAccordionItem>`,
|
|
||||||
)
|
|
||||||
const header = wrapper.find('button[aria-expanded]')
|
|
||||||
expect(header.classes()).toContain('bg-red-500')
|
|
||||||
expect(wrapper.find('[role="region"]').html()).toContain('text-lg')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders a rotating chevron icon', () => {
|
|
||||||
const wrapper = mountInAccordion(
|
|
||||||
`<MalioAccordionItem title="T" value="t"><p>X</p></MalioAccordionItem>`,
|
|
||||||
)
|
|
||||||
expect(wrapper.find('button[aria-expanded] svg').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,126 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div>
|
|
||||||
<h3 class="m-0">
|
|
||||||
<button
|
|
||||||
:id="headerId"
|
|
||||||
ref="headerRef"
|
|
||||||
type="button"
|
|
||||||
:class="headerClasses"
|
|
||||||
:aria-expanded="open"
|
|
||||||
:aria-controls="panelId"
|
|
||||||
:disabled="disabled"
|
|
||||||
:aria-disabled="disabled || undefined"
|
|
||||||
@click="onToggle"
|
|
||||||
@keydown.down.prevent="ctx.focusSibling(value, 1)"
|
|
||||||
@keydown.up.prevent="ctx.focusSibling(value, -1)"
|
|
||||||
>
|
|
||||||
<span>{{ title }}</span>
|
|
||||||
<IconifyIcon
|
|
||||||
icon="mdi:chevron-down"
|
|
||||||
:width="24"
|
|
||||||
class="shrink-0 transition-transform duration-200"
|
|
||||||
:class="open ? 'rotate-180' : ''"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</h3>
|
|
||||||
<div
|
|
||||||
:id="panelId"
|
|
||||||
role="region"
|
|
||||||
:aria-labelledby="headerId"
|
|
||||||
class="grid transition-[grid-template-rows] duration-200 ease-out"
|
|
||||||
:class="open ? 'grid-rows-[1fr]' : 'grid-rows-[0fr]'"
|
|
||||||
@transitionend="onPanelTransitionEnd"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
:class="overflowVisible ? 'overflow-visible' : 'overflow-hidden'"
|
|
||||||
:inert="!open || undefined"
|
|
||||||
>
|
|
||||||
<div :class="panelInnerClass">
|
|
||||||
<slot />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, inject, onBeforeUnmount, onMounted, ref, useId, watch} from 'vue'
|
|
||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
|
||||||
import {twMerge} from 'tailwind-merge'
|
|
||||||
import {accordionContextKey} from './context'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioAccordionItem', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
|
||||||
title: string
|
|
||||||
value?: string
|
|
||||||
defaultOpen?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
headerClass?: string
|
|
||||||
panelClass?: string
|
|
||||||
}>(), {
|
|
||||||
value: '',
|
|
||||||
defaultOpen: false,
|
|
||||||
disabled: false,
|
|
||||||
headerClass: '',
|
|
||||||
panelClass: '',
|
|
||||||
})
|
|
||||||
|
|
||||||
const ctx = inject(accordionContextKey)
|
|
||||||
if (!ctx) {
|
|
||||||
throw new Error('MalioAccordionItem doit être utilisé à l\'intérieur de MalioAccordion')
|
|
||||||
}
|
|
||||||
|
|
||||||
const generatedId = useId()
|
|
||||||
const value = computed(() => props.value || `malio-accordion-item-${generatedId}`)
|
|
||||||
const headerRef = ref<HTMLButtonElement | null>(null)
|
|
||||||
const headerId = computed(() => `${ctx.baseId.value}-header-${value.value}`)
|
|
||||||
const panelId = computed(() => `${ctx.baseId.value}-panel-${value.value}`)
|
|
||||||
const open = computed(() => ctx.isOpen(value.value))
|
|
||||||
|
|
||||||
// Le panneau garde `overflow-hidden` pendant l'animation (clipping requis par
|
|
||||||
// la transition grid-template-rows), puis passe en `overflow-visible` une fois
|
|
||||||
// complètement ouvert pour qu'un popover enfant (datepicker, select…) ne soit
|
|
||||||
// pas rogné. On re-clippe dès le début de la fermeture.
|
|
||||||
const overflowVisible = ref(false)
|
|
||||||
|
|
||||||
watch(open, (isOpen) => {
|
|
||||||
if (!isOpen) overflowVisible.value = false
|
|
||||||
})
|
|
||||||
|
|
||||||
function onPanelTransitionEnd(e: TransitionEvent) {
|
|
||||||
if (e.propertyName === 'grid-template-rows' && open.value) {
|
|
||||||
overflowVisible.value = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onToggle() {
|
|
||||||
if (props.disabled) return
|
|
||||||
ctx.toggle(value.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
const headerClasses = computed(() =>
|
|
||||||
twMerge(
|
|
||||||
'flex w-full items-center justify-between gap-4 px-7 pt-[28px] pb-[20px] text-left font-[600] text-[20px] transition-colors',
|
|
||||||
props.disabled ? 'cursor-not-allowed text-m-muted' : 'cursor-pointer hover:bg-m-surface',
|
|
||||||
props.headerClass,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
const panelInnerClass = computed(() => twMerge('px-7 pt-[10px] pb-[20px]', props.panelClass))
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
ctx.register(
|
|
||||||
{
|
|
||||||
value: value.value,
|
|
||||||
getHeaderEl: () => headerRef.value,
|
|
||||||
isDisabled: () => props.disabled,
|
|
||||||
},
|
|
||||||
props.defaultOpen,
|
|
||||||
)
|
|
||||||
// Ouvert au montage (defaultOpen / contrôlé) : pas d'animation, overflow visible direct.
|
|
||||||
if (open.value) overflowVisible.value = true
|
|
||||||
})
|
|
||||||
|
|
||||||
onBeforeUnmount(() => ctx.unregister(value.value))
|
|
||||||
</script>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import type {ComputedRef, InjectionKey} from 'vue'
|
|
||||||
|
|
||||||
export interface AccordionItemRegistration {
|
|
||||||
value: string
|
|
||||||
getHeaderEl: () => HTMLElement | null
|
|
||||||
isDisabled: () => boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AccordionContext {
|
|
||||||
mode: ComputedRef<'single' | 'multiple'>
|
|
||||||
baseId: ComputedRef<string>
|
|
||||||
isOpen: (value: string) => boolean
|
|
||||||
toggle: (value: string) => void
|
|
||||||
register: (item: AccordionItemRegistration, defaultOpen: boolean) => void
|
|
||||||
unregister: (value: string) => void
|
|
||||||
focusSibling: (value: string, offset: 1 | -1) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export const accordionContextKey: InjectionKey<AccordionContext> = Symbol('MalioAccordion')
|
|
||||||
@@ -162,7 +162,7 @@ describe('MalioButton', () => {
|
|||||||
it('applies correct dimensions', () => {
|
it('applies correct dimensions', () => {
|
||||||
const wrapper = mountComponent()
|
const wrapper = mountComponent()
|
||||||
|
|
||||||
expect(wrapper.get('button').classes()).toContain('w-[200px]')
|
expect(wrapper.get('button').classes()).toContain('w-[240px]')
|
||||||
expect(wrapper.get('button').classes()).toContain('h-[40px]')
|
expect(wrapper.get('button').classes()).toContain('h-[40px]')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ const variantClasses = computed(() => {
|
|||||||
|
|
||||||
const mergedButtonClass = computed(() =>
|
const mergedButtonClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'inline-flex w-[200px] h-[40px] items-center justify-center gap-1 p-[10px] rounded-md text-base font-bold leading-[150%] transition-colors duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-m-primary/50',
|
'inline-flex w-[240px] h-[40px] items-center justify-center gap-1 p-[10px] rounded-md text-base font-bold leading-[150%] transition-colors duration-150 focus:outline-none focus-visible:ring-2 focus-visible:ring-m-primary/50',
|
||||||
variantClasses.value,
|
variantClasses.value,
|
||||||
props.buttonClass,
|
props.buttonClass,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ type CheckboxProps = {
|
|||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const CheckboxForTest = Checkbox as DefineComponent<CheckboxProps>
|
const CheckboxForTest = Checkbox as DefineComponent<CheckboxProps>
|
||||||
@@ -162,33 +161,4 @@ describe('MalioCheckbox', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
expect(wrapper.get('label').classes()).toContain('text-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountCheckbox({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountCheckbox({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountCheckbox({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountCheckbox({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountCheckbox({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -25,12 +25,12 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="mergedMessageClass"
|
:class="mergedMessageClass"
|
||||||
>
|
>
|
||||||
@@ -42,7 +42,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioCheckbox', inheritAttrs: false})
|
defineOptions({name: 'MalioCheckbox', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -61,7 +60,6 @@ const props = withDefaults(
|
|||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -77,7 +75,6 @@ const props = withDefaults(
|
|||||||
hint: '',
|
hint: '',
|
||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -125,7 +122,6 @@ const mergedLabelClass = computed(() =>
|
|||||||
const mergedMessageClass = computed(() =>
|
const mergedMessageClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'text-xs',
|
'text-xs',
|
||||||
props.reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
|
|||||||
@@ -57,16 +57,15 @@
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="totalItems > 0"
|
v-if="totalItems > 0"
|
||||||
class="flex items-center justify-between pt-2"
|
class="flex justify-between pt-2"
|
||||||
data-test="pagination"
|
data-test="pagination"
|
||||||
>
|
>
|
||||||
<div class="flex items-center gap-4">
|
<div class="flex gap-4">
|
||||||
<span class="whitespace-nowrap text-[16px] text-black">Lignes :</span>
|
<span class="whitespace-nowrap text-[16px] text-black self-center">Lignes :</span>
|
||||||
<div class="h-12">
|
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
:model-value="perPage"
|
:model-value="perPage"
|
||||||
:options="perPageSelectOptions"
|
:options="perPageSelectOptions"
|
||||||
group-class="w-20"
|
min-width="w-20 !mt-0"
|
||||||
rounded="rounded"
|
rounded="rounded"
|
||||||
text-field="text-sm"
|
text-field="text-sm"
|
||||||
text-value="text-sm"
|
text-value="text-sm"
|
||||||
@@ -75,9 +74,8 @@
|
|||||||
@update:model-value="onPerPageChange"
|
@update:model-value="onPerPageChange"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav aria-label="Pagination" class="flex items-center gap-1" data-test="pagination-nav">
|
<nav aria-label="Pagination" class="flex gap-1" data-test="pagination-nav">
|
||||||
<MalioButton
|
<MalioButton
|
||||||
variant="tertiary"
|
variant="tertiary"
|
||||||
label="Prev"
|
label="Prev"
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ type DateProps = {
|
|||||||
inputClass?: string
|
inputClass?: string
|
||||||
labelClass?: string
|
labelClass?: string
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const DateForTest = Date_ as DefineComponent<DateProps>
|
const DateForTest = Date_ as DefineComponent<DateProps>
|
||||||
@@ -41,16 +40,6 @@ describe('MalioDate', () => {
|
|||||||
expect(wrapper.find('[data-test="calendar-icon"]').exists()).toBe(true)
|
expect(wrapper.find('[data-test="calendar-icon"]').exists()).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountDate({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountDate({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('displays the formatted value in the field', () => {
|
it('displays the formatted value in the field', () => {
|
||||||
const wrapper = mountDate({modelValue: '2026-05-19'})
|
const wrapper = mountDate({modelValue: '2026-05-19'})
|
||||||
const input = wrapper.get('[data-test="date-input"]').element as HTMLInputElement
|
const input = wrapper.get('[data-test="date-input"]').element as HTMLInputElement
|
||||||
@@ -186,37 +175,6 @@ describe('MalioDate', () => {
|
|||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
await wrapper.get('[data-test="date-input"]').trigger('click')
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(false)
|
expect(wrapper.find('[data-test="popover"]').exists()).toBe(false)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('readonly vide : bordure noire sans bleu', () => {
|
|
||||||
const wrapper = mountDate({readonly: true})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]')
|
|
||||||
expect(input.classes()).toContain('border-black')
|
|
||||||
expect(input.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(input.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label muted sans bleu', () => {
|
|
||||||
const wrapper = mountDate({readonly: true, label: 'Date'})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
expect(label.classes()).not.toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : icône calendrier en text-m-muted', () => {
|
|
||||||
const wrapper = mountDate({readonly: true, label: 'Date'})
|
|
||||||
expect(wrapper.get('[data-test="calendar-icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label et icône en noir, bordure noire', () => {
|
|
||||||
const wrapper = mountDate({readonly: true, label: 'Date', modelValue: '2026-05-19'})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]')
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
const icon = wrapper.get('[data-test="calendar-icon"]')
|
|
||||||
expect(input.classes()).toContain('border-black')
|
|
||||||
expect(input.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-black')
|
|
||||||
expect(icon.classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('accessibilité', () => {
|
describe('accessibilité', () => {
|
||||||
@@ -237,25 +195,4 @@ describe('MalioDate', () => {
|
|||||||
expect(input.value).toBe('25/12/2026')
|
expect(input.value).toBe('25/12/2026')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('reserveMessageSpace', () => {
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountDate({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountDate({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountDate({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,123 +0,0 @@
|
|||||||
import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import type {DefineComponent} from 'vue'
|
|
||||||
import DateTime_ from './DateTime.vue'
|
|
||||||
import MalioTimePicker from '../time/TimePicker.vue'
|
|
||||||
|
|
||||||
type DateTimeProps = {
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
min?: string
|
|
||||||
max?: string
|
|
||||||
clearable?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const DateTimeForTest = DateTime_ as DefineComponent<DateTimeProps>
|
|
||||||
const mountDateTime = (props: DateTimeProps = {}) =>
|
|
||||||
mount(DateTimeForTest, {props, attachTo: document.body})
|
|
||||||
|
|
||||||
describe('MalioDateTime', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.useFakeTimers()
|
|
||||||
vi.setSystemTime(new Date(2026, 4, 19, 9, 5, 0)) // 19 mai 2026, 09:05
|
|
||||||
})
|
|
||||||
afterEach(() => vi.useRealTimers())
|
|
||||||
|
|
||||||
describe('rendu', () => {
|
|
||||||
it('affiche le label et l\'icône calendrier', () => {
|
|
||||||
const wrapper = mountDateTime({label: 'Rendez-vous'})
|
|
||||||
expect(wrapper.get('label').text()).toBe('Rendez-vous')
|
|
||||||
expect(wrapper.find('[data-test="calendar-icon"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche la valeur formatée date + heure dans le champ', () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]').element as HTMLInputElement
|
|
||||||
expect(input.value).toBe('20/05/2026 14:30')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('popover', () => {
|
|
||||||
it('ouvre la grille et le champ sélecteur d\'heure au clic', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
expect(wrapper.find('[data-test="month-grid"]').exists()).toBe(true)
|
|
||||||
expect(wrapper.findComponent(MalioTimePicker).exists()).toBe(true)
|
|
||||||
expect(wrapper.find('[data-test="time-field"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('sélection', () => {
|
|
||||||
it('émet le jour à l\'heure actuelle (si aucune heure choisie) et garde le popover ouvert', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
await wrapper.get('[data-test="day"][data-iso="2026-05-19"]').trigger('click')
|
|
||||||
// heure système figée à 09:05
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-19T09:05:00'])
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applique l\'heure réglée avant le clic du jour', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
wrapper.findComponent(MalioTimePicker).vm.$emit('update:modelValue', '09:15')
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
await wrapper.get('[data-test="day"][data-iso="2026-05-19"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-19T09:15:00'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('met à jour l\'heure quand une date est déjà choisie', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
wrapper.findComponent(MalioTimePicker).vm.$emit('update:modelValue', '08:45')
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-20T08:45:00'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('initialise le champ heure depuis la valeur', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
expect(wrapper.findComponent(MalioTimePicker).props('modelValue')).toBe('14:30')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('bornes min/max', () => {
|
|
||||||
it('désactive les jours hors bornes (datetime borné sur la date)', async () => {
|
|
||||||
const wrapper = mountDateTime({min: '2026-05-10T00:00:00', max: '2026-05-20T00:00:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
const outside = wrapper.get('[data-test="day"][data-iso="2026-05-05"]')
|
|
||||||
expect((outside.element as HTMLButtonElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('effacement', () => {
|
|
||||||
it('émet null au clic sur la croix', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="clear"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([null])
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('accessibilité', () => {
|
|
||||||
it('positionne aria-invalid et describedby sur erreur', () => {
|
|
||||||
const wrapper = mountDateTime({error: 'Date requise'})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]')
|
|
||||||
expect(input.attributes('aria-invalid')).toBe('true')
|
|
||||||
expect(input.attributes('aria-describedby')).toBeTruthy()
|
|
||||||
expect(wrapper.text()).toContain('Date requise')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
<template>
|
|
||||||
<CalendarField
|
|
||||||
:id="id"
|
|
||||||
:display-value="displayValue"
|
|
||||||
:sync-to="datePart"
|
|
||||||
:name="name"
|
|
||||||
:label="label"
|
|
||||||
:placeholder="placeholder"
|
|
||||||
:required="required"
|
|
||||||
:disabled="disabled"
|
|
||||||
:readonly="readonly"
|
|
||||||
:hint="hint"
|
|
||||||
:error="error"
|
|
||||||
:success="success"
|
|
||||||
:clearable="clearable"
|
|
||||||
:input-class="inputClass"
|
|
||||||
:label-class="labelClass"
|
|
||||||
:group-class="groupClass"
|
|
||||||
v-bind="$attrs"
|
|
||||||
@clear="onClear"
|
|
||||||
>
|
|
||||||
<template #default="{ currentMonth, currentYear }">
|
|
||||||
<MonthGrid
|
|
||||||
:month="currentMonth"
|
|
||||||
:year="currentYear"
|
|
||||||
:selected-date="datePart"
|
|
||||||
:min="min?.slice(0, 10)"
|
|
||||||
:max="max?.slice(0, 10)"
|
|
||||||
@select="onSelectDay"
|
|
||||||
/>
|
|
||||||
<div class="mt-4">
|
|
||||||
<MalioTimePicker
|
|
||||||
:model-value="timeValue || null"
|
|
||||||
label="Heure"
|
|
||||||
:clearable="false"
|
|
||||||
static-popover
|
|
||||||
@update:model-value="onTimeChange"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</CalendarField>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, ref, watch} from 'vue'
|
|
||||||
import CalendarField from './internal/CalendarField.vue'
|
|
||||||
import MonthGrid from './internal/MonthGrid.vue'
|
|
||||||
import MalioTimePicker from '../time/TimePicker.vue'
|
|
||||||
import {formatTime} from '../time/composables/timeFormat'
|
|
||||||
import {composeDateTime, formatIsoDateTimeToDisplay, isValidIsoDateTime, splitDateTime} from './composables/datetimeFormat'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioDateTime', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
min?: string
|
|
||||||
max?: string
|
|
||||||
clearable?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
label: '',
|
|
||||||
modelValue: undefined,
|
|
||||||
placeholder: 'JJ/MM/AAAA HH:MM',
|
|
||||||
required: false,
|
|
||||||
disabled: false,
|
|
||||||
readonly: false,
|
|
||||||
hint: '',
|
|
||||||
error: '',
|
|
||||||
success: '',
|
|
||||||
min: undefined,
|
|
||||||
max: undefined,
|
|
||||||
clearable: true,
|
|
||||||
inputClass: '',
|
|
||||||
labelClass: '',
|
|
||||||
groupClass: '',
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{(e: 'update:modelValue', value: string | null): void}>()
|
|
||||||
|
|
||||||
// pendingTime : heure réglée avant qu'un jour ne soit choisi (sinon on ne peut pas émettre).
|
|
||||||
const pendingTime = ref('')
|
|
||||||
|
|
||||||
const parts = computed(() => splitDateTime(props.modelValue ?? null))
|
|
||||||
const datePart = computed(() => parts.value.date)
|
|
||||||
const displayValue = computed(() => formatIsoDateTimeToDisplay(props.modelValue ?? null))
|
|
||||||
const timeValue = computed(() => parts.value.time || pendingTime.value)
|
|
||||||
|
|
||||||
function onSelectDay(iso: string) {
|
|
||||||
// Si aucune heure n'a été choisie, on prend l'heure actuelle (pas 00:00).
|
|
||||||
// (heure courante au moment du clic)
|
|
||||||
const now = new Date()
|
|
||||||
const time = parts.value.time || pendingTime.value || formatTime(now.getHours(), now.getMinutes())
|
|
||||||
emit('update:modelValue', composeDateTime(iso, time))
|
|
||||||
}
|
|
||||||
|
|
||||||
function onTimeChange(value: string | null) {
|
|
||||||
if (!value) return
|
|
||||||
if (datePart.value) {
|
|
||||||
emit('update:modelValue', composeDateTime(datePart.value, value))
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
pendingTime.value = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClear() {
|
|
||||||
pendingTime.value = ''
|
|
||||||
emit('update:modelValue', null)
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(() => props.modelValue, (val) => {
|
|
||||||
if (val && !isValidIsoDateTime(val) && import.meta.dev) {
|
|
||||||
console.warn(`[MalioDateTime] modelValue invalide ignoré : "${val}"`)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {
|
|
||||||
composeDateTime,
|
|
||||||
formatIsoDateTimeToDisplay,
|
|
||||||
isValidIsoDateTime,
|
|
||||||
splitDateTime,
|
|
||||||
} from './datetimeFormat'
|
|
||||||
|
|
||||||
describe('datetimeFormat', () => {
|
|
||||||
describe('isValidIsoDateTime', () => {
|
|
||||||
it('accepte un datetime ISO complet valide', () => {
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30:00')).toBe(true)
|
|
||||||
expect(isValidIsoDateTime('2026-01-01T00:00:00')).toBe(true)
|
|
||||||
expect(isValidIsoDateTime('2026-12-31T23:59:59')).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('rejette une date seule, des composants invalides ou une chaîne vide', () => {
|
|
||||||
expect(isValidIsoDateTime('2026-05-20')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-13-01T00:00:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T24:00:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:60:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30:60')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('')).toBe(false)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('formatIsoDateTimeToDisplay', () => {
|
|
||||||
it('formate un datetime valide en JJ/MM/AAAA HH:MM', () => {
|
|
||||||
expect(formatIsoDateTimeToDisplay('2026-05-20T14:30:00')).toBe('20/05/2026 14:30')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renvoie une chaîne vide pour nul ou invalide', () => {
|
|
||||||
expect(formatIsoDateTimeToDisplay(null)).toBe('')
|
|
||||||
expect(formatIsoDateTimeToDisplay('2026-05-20')).toBe('')
|
|
||||||
expect(formatIsoDateTimeToDisplay('nope')).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('splitDateTime', () => {
|
|
||||||
it('découpe un datetime valide', () => {
|
|
||||||
expect(splitDateTime('2026-05-20T14:30:00')).toEqual({date: '2026-05-20', time: '14:30'})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renvoie date null et time vide pour nul, date seule ou invalide', () => {
|
|
||||||
expect(splitDateTime(null)).toEqual({date: null, time: ''})
|
|
||||||
expect(splitDateTime('2026-05-20')).toEqual({date: null, time: ''})
|
|
||||||
expect(splitDateTime('nope')).toEqual({date: null, time: ''})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('composeDateTime', () => {
|
|
||||||
it('recompose un datetime ISO avec secondes à 00', () => {
|
|
||||||
expect(composeDateTime('2026-05-20', '14:30')).toBe('2026-05-20T14:30:00')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('utilise 00:00 quand l\'heure est vide', () => {
|
|
||||||
expect(composeDateTime('2026-05-20', '')).toBe('2026-05-20T00:00:00')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import {isValidIso} from './dateFormat'
|
|
||||||
|
|
||||||
const DATETIME_RE = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2}):(\d{2})$/
|
|
||||||
|
|
||||||
export function isValidIsoDateTime(s: string): boolean {
|
|
||||||
const m = DATETIME_RE.exec(s)
|
|
||||||
if (!m) return false
|
|
||||||
const [, date, hh, mm, ss] = m
|
|
||||||
if (!isValidIso(date)) return false
|
|
||||||
const h = Number(hh)
|
|
||||||
const min = Number(mm)
|
|
||||||
const sec = Number(ss)
|
|
||||||
return h >= 0 && h <= 23 && min >= 0 && min <= 59 && sec >= 0 && sec <= 59
|
|
||||||
}
|
|
||||||
|
|
||||||
export function formatIsoDateTimeToDisplay(s: string | null): string {
|
|
||||||
if (!s || !isValidIsoDateTime(s)) return ''
|
|
||||||
const [date, time] = s.split('T')
|
|
||||||
const [y, mo, d] = date.split('-')
|
|
||||||
const [hh, mm] = time.split(':')
|
|
||||||
return `${d}/${mo}/${y} ${hh}:${mm}`
|
|
||||||
}
|
|
||||||
|
|
||||||
export function splitDateTime(s: string | null): {date: string | null; time: string} {
|
|
||||||
if (!s || !isValidIsoDateTime(s)) return {date: null, time: ''}
|
|
||||||
const [date, time] = s.split('T')
|
|
||||||
return {date, time: time.slice(0, 5)}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function composeDateTime(date: string, time: string): string {
|
|
||||||
const t = time || '00:00'
|
|
||||||
return `${date}T${t}:00`
|
|
||||||
}
|
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div class="absolute right-3 top-1/2 flex -translate-y-1/2 items-center gap-1">
|
<div class="absolute right-3 top-1/2 flex -translate-y-1/2 items-center gap-1">
|
||||||
@@ -85,12 +85,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError ? 'text-m-danger' : hasSuccess ? 'text-m-success' : 'text-m-muted',
|
hasError ? 'text-m-danger' : hasSuccess ? 'text-m-success' : 'text-m-muted',
|
||||||
'mt-1 ml-[2px] text-xs',
|
'mt-1 ml-[2px] text-xs',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
@@ -102,7 +101,6 @@
|
|||||||
import {computed, ref, useAttrs, useId, watch} from 'vue'
|
import {computed, ref, useAttrs, useId, watch} from 'vue'
|
||||||
import {Icon} from '@iconify/vue'
|
import {Icon} from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../../shared/RequiredMark.vue'
|
|
||||||
import CalendarHeader from './CalendarHeader.vue'
|
import CalendarHeader from './CalendarHeader.vue'
|
||||||
import MonthPicker from './MonthPicker.vue'
|
import MonthPicker from './MonthPicker.vue'
|
||||||
import {useCalendarPopover} from '../composables/useCalendarPopover'
|
import {useCalendarPopover} from '../composables/useCalendarPopover'
|
||||||
@@ -128,7 +126,6 @@ const props = withDefaults(
|
|||||||
inputClass?: string
|
inputClass?: string
|
||||||
labelClass?: string
|
labelClass?: string
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -145,7 +142,6 @@ const props = withDefaults(
|
|||||||
inputClass: '',
|
inputClass: '',
|
||||||
labelClass: '',
|
labelClass: '',
|
||||||
groupClass: '',
|
groupClass: '',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -162,7 +158,6 @@ const inputId = computed(() => props.id?.toString() || `malio-date-${generatedId
|
|||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
||||||
const isFilled = computed(() => props.displayValue.length > 0)
|
const isFilled = computed(() => props.displayValue.length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const showClear = computed(() =>
|
const showClear = computed(() =>
|
||||||
props.clearable && isFilled.value && !props.disabled && !props.readonly,
|
props.clearable && isFilled.value && !props.disabled && !props.readonly,
|
||||||
)
|
)
|
||||||
@@ -200,16 +195,14 @@ const mergedGroupClass = computed(() =>
|
|||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full cursor-pointer rounded-md border bg-white py-1 pl-3 pr-10 text-lg outline-none transition-[padding] duration-150 placeholder:text-transparent',
|
'floating-input peer min-h-[40px] w-full cursor-pointer rounded-md border bg-white py-1 pl-3 pr-10 text-lg outline-none transition-[padding] duration-150 placeholder:text-transparent',
|
||||||
isReadonly.value
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
props.disabled ? 'cursor-not-allowed text-black/60 border-m-muted' : '',
|
props.disabled ? 'cursor-not-allowed text-black/60 border-m-muted' : '',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger'
|
? 'border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success'
|
? 'border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
(!isReadonly.value && isOpen.value) ? 'border-m-primary !py-[9px] !rounded-b-none' : '',
|
isOpen.value ? 'border-m-primary !py-[9px] !rounded-b-none' : '',
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -217,13 +210,11 @@ const mergedInputClass = computed(() =>
|
|||||||
const mergedLabelClass = computed(() =>
|
const mergedLabelClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute left-3 top-2 mt-[5px] inline-block origin-left font-medium text-sm transition-transform duration-150',
|
'floating-label absolute left-3 top-2 mt-[5px] inline-block origin-left font-medium text-sm transition-transform duration-150',
|
||||||
(isReadonly.value ? isFilled.value : (isFilled.value || isOpen.value)) ? '-translate-y-[1.25rem] scale-90' : '',
|
(isFilled.value || isOpen.value) ? '-translate-y-[1.25rem] scale-90' : '',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: isOpen.value
|
: isOpen.value
|
||||||
? 'text-m-primary'
|
? 'text-m-primary'
|
||||||
: 'peer-placeholder-shown:text-m-muted text-black',
|
: 'peer-placeholder-shown:text-m-muted text-black',
|
||||||
@@ -234,7 +225,6 @@ const mergedLabelClass = computed(() =>
|
|||||||
const iconStateClass = computed(() => {
|
const iconStateClass = computed(() => {
|
||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isOpen.value) return 'text-m-primary'
|
if (isOpen.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return 'text-m-muted'
|
return 'text-m-muted'
|
||||||
|
|||||||
@@ -152,13 +152,12 @@ describe('MalioDrawer', () => {
|
|||||||
expect(wrapper.find('[data-test="header"]').classes()).toContain('bg-m-primary')
|
expect(wrapper.find('[data-test="header"]').classes()).toContain('bg-m-primary')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders the #footer slot in a footer pinned below the body', () => {
|
it('renders the #footer slot inside the body (scrollable zone)', () => {
|
||||||
const wrapper = mountComponent(
|
const wrapper = mountComponent(
|
||||||
{ modelValue: true },
|
{ modelValue: true },
|
||||||
{ footer: '<button data-test="save">Enregistrer</button>' },
|
{ footer: '<button data-test="save">Enregistrer</button>' },
|
||||||
)
|
)
|
||||||
expect(wrapper.find('[data-test="body"] [data-test="footer"]').exists()).toBe(false)
|
expect(wrapper.find('[data-test="body"] [data-test="footer"] [data-test="save"]').exists()).toBe(true)
|
||||||
expect(wrapper.find('[data-test="footer"] [data-test="save"]').exists()).toBe(true)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('does not render the footer wrapper when no #footer slot', () => {
|
it('does not render the footer wrapper when no #footer slot', () => {
|
||||||
@@ -171,12 +170,14 @@ describe('MalioDrawer', () => {
|
|||||||
expect(wrapper.find('[data-test="body"]').classes()).toContain('px-10')
|
expect(wrapper.find('[data-test="body"]').classes()).toContain('px-10')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('applies footerClass to the footer', () => {
|
it('applies footerClass to the footer wrapper', () => {
|
||||||
const wrapper = mountComponent(
|
const wrapper = mountComponent(
|
||||||
{ modelValue: true, footerClass: 'justify-end' },
|
{ modelValue: true, footerClass: 'sticky bottom-0' },
|
||||||
{ footer: '<span>pied</span>' },
|
{ footer: '<span>pied</span>' },
|
||||||
)
|
)
|
||||||
expect(wrapper.find('[data-test="footer"]').classes()).toContain('justify-end')
|
const footer = wrapper.find('[data-test="footer"]')
|
||||||
|
expect(footer.classes()).toContain('sticky')
|
||||||
|
expect(footer.classes()).toContain('bottom-0')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('aligns to the right by default', () => {
|
it('aligns to the right by default', () => {
|
||||||
|
|||||||
@@ -64,16 +64,16 @@
|
|||||||
data-test="body"
|
data-test="body"
|
||||||
>
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
v-if="$slots.footer"
|
v-if="$slots.footer"
|
||||||
:class="twMerge('flex shrink-0 items-center gap-3 px-5 py-4', footerClass)"
|
:class="footerClass"
|
||||||
data-test="footer"
|
data-test="footer"
|
||||||
>
|
>
|
||||||
<slot name="footer" />
|
<slot name="footer" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</Transition>
|
</Transition>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ type InputProps = {
|
|||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputForTest = Input as DefineComponent<InputProps>
|
const InputForTest = Input as DefineComponent<InputProps>
|
||||||
@@ -54,16 +53,6 @@ describe('MalioInputText', () => {
|
|||||||
expect(wrapper.get('label').text()).toBe('labelTest')
|
expect(wrapper.get('label').text()).toBe('labelTest')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies the name attribute', () => {
|
it('applies the name attribute', () => {
|
||||||
const wrapper = mountInput({name: 'nameTest'})
|
const wrapper = mountInput({name: 'nameTest'})
|
||||||
|
|
||||||
@@ -137,13 +126,6 @@ describe('MalioInputText', () => {
|
|||||||
expect(wrapper.get('input').classes()).toContain('text-black/60')
|
expect(wrapper.get('input').classes()).toContain('text-black/60')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('shows muted label color when disabled (matches border color)', () => {
|
|
||||||
const wrapper = mountInput({label: 'Email', disabled: true, modelValue: 'foo@bar.com'})
|
|
||||||
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('text-black/60')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue on input change', async () => {
|
it('emits update:modelValue on input change', async () => {
|
||||||
const wrapper = mountInput({modelValue: ''})
|
const wrapper = mountInput({modelValue: ''})
|
||||||
|
|
||||||
@@ -271,34 +253,6 @@ describe('MalioInputText', () => {
|
|||||||
expect(wrapper.get('p.text-m-muted').text()).toBe('Hint message test')
|
expect(wrapper.get('p.text-m-muted').text()).toBe('Hint message test')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('reserves space for the message even when no hint/error/success is set', () => {
|
|
||||||
const wrapper = mountInput({})
|
|
||||||
|
|
||||||
const p = wrapper.find('p')
|
|
||||||
expect(p.exists()).toBe(true)
|
|
||||||
expect(p.text()).toBe('')
|
|
||||||
expect(p.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render label when label prop is missing', () => {
|
it('does not render label when label prop is missing', () => {
|
||||||
const wrapper = mountInput({labelClass: 'text-red-500'})
|
const wrapper = mountInput({labelClass: 'text-red-500'})
|
||||||
|
|
||||||
@@ -354,25 +308,4 @@ describe('MalioInputText', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir et icône noire', () => {
|
|
||||||
const wrapper = mountInput({label: 'Champ', readonly: true, modelValue: 'hello', iconName: 'mdi:key-outline'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ type InputAmountProps = {
|
|||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputAmountForTest = InputAmount as DefineComponent<InputAmountProps>
|
const InputAmountForTest = InputAmount as DefineComponent<InputAmountProps>
|
||||||
@@ -175,59 +174,4 @@ describe('MalioInputAmount', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : icône en text-m-muted', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir et icône noire', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', readonly: true, modelValue: '12.50'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountInputAmount({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -53,7 +53,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -65,7 +64,6 @@
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputAmount', inheritAttrs: false})
|
defineOptions({name: 'MalioInputAmount', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -91,7 +89,6 @@ const props = withDefaults(
|
|||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -112,9 +109,8 @@ const props = withDefaults(
|
|||||||
hint: '',
|
hint: '',
|
||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
iconSize: 20,
|
iconSize: 24,
|
||||||
iconColor: 'text-m-muted',
|
iconColor: 'text-m-muted',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -126,15 +122,10 @@ const isFocused = ref(false)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-amount-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-amount-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
@@ -144,38 +135,29 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
iconInputPaddingClass.value,
|
iconInputPaddingClass.value,
|
||||||
isReadonly.value ? '' : focusPaddingClass.value,
|
focusPaddingClass.value,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
const mergedLabelClass = computed(() =>
|
const mergedLabelClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
labelPositionClass.value,
|
labelPositionClass.value,
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -252,7 +234,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return props.iconColor
|
if (disabled.value) return props.iconColor
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return props.iconColor
|
return props.iconColor
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ type InputAutocompleteProps = {
|
|||||||
debounce?: number
|
debounce?: number
|
||||||
minSearchLength?: number
|
minSearchLength?: number
|
||||||
allowCreate?: boolean
|
allowCreate?: boolean
|
||||||
localFilter?: boolean
|
|
||||||
iconName?: string
|
iconName?: string
|
||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
@@ -36,7 +35,6 @@ type InputAutocompleteProps = {
|
|||||||
noResultsText?: string
|
noResultsText?: string
|
||||||
loadingText?: string
|
loadingText?: string
|
||||||
minSearchText?: string
|
minSearchText?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputAutocompleteForTest = InputAutocomplete as DefineComponent<InputAutocompleteProps>
|
const InputAutocompleteForTest = InputAutocomplete as DefineComponent<InputAutocompleteProps>
|
||||||
@@ -66,16 +64,6 @@ describe('MalioInputAutocomplete', () => {
|
|||||||
expect(wrapper.get('label').text()).toBe('Pays')
|
expect(wrapper.get('label').text()).toBe('Pays')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders with type combobox role', () => {
|
it('renders with type combobox role', () => {
|
||||||
const wrapper = mountComponent()
|
const wrapper = mountComponent()
|
||||||
|
|
||||||
@@ -439,128 +427,4 @@ describe('MalioInputAutocomplete', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('input').element.value).toBe('Custom')
|
expect(wrapper.get('input').element.value).toBe('Custom')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('does not filter options when localFilter is false (default)', async () => {
|
|
||||||
const wrapper = mountComponent({options})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
await wrapper.get('input').setValue('fr')
|
|
||||||
|
|
||||||
expect(wrapper.findAll('[data-test="option"]')).toHaveLength(3)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('filters options client-side when localFilter is true', async () => {
|
|
||||||
const wrapper = mountComponent({options, localFilter: true})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
await wrapper.get('input').setValue('fr')
|
|
||||||
|
|
||||||
const items = wrapper.findAll('[data-test="option"]')
|
|
||||||
expect(items).toHaveLength(1)
|
|
||||||
expect(items[0].text()).toBe('France')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('localFilter is case-insensitive and matches substrings', async () => {
|
|
||||||
const wrapper = mountComponent({options, localFilter: true})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
await wrapper.get('input').setValue('GIQ')
|
|
||||||
|
|
||||||
const items = wrapper.findAll('[data-test="option"]')
|
|
||||||
expect(items).toHaveLength(1)
|
|
||||||
expect(items[0].text()).toBe('Belgique')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('localFilter shows all options when input is empty', async () => {
|
|
||||||
const wrapper = mountComponent({options, localFilter: true})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
|
|
||||||
expect(wrapper.findAll('[data-test="option"]')).toHaveLength(3)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('localFilter shows the no-results state when nothing matches', async () => {
|
|
||||||
const wrapper = mountComponent({options, localFilter: true})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
await wrapper.get('input').setValue('zzzzz')
|
|
||||||
|
|
||||||
expect(wrapper.findAll('[data-test="option"]')).toHaveLength(0)
|
|
||||||
expect(wrapper.find('[data-test="no-results-text"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps the floating label at the same position whether focused or not (no jump)', async () => {
|
|
||||||
const wrapper = mountComponent({options, label: 'Pays', modelValue: 'fr'})
|
|
||||||
|
|
||||||
// when a value is selected and the field is not focused, the label is already floated
|
|
||||||
const labelClasses = wrapper.get('label').classes()
|
|
||||||
expect(labelClasses).toContain('-translate-y-[1.25rem]')
|
|
||||||
// and there is no extra peer-focus translate that would make it jump on click
|
|
||||||
expect(labelClasses).not.toContain('peer-focus:-translate-y-[1.55rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not shift inner text horizontally on focus (no focus:pl change)', () => {
|
|
||||||
const wrapper = mountComponent({options})
|
|
||||||
|
|
||||||
const inputClasses = wrapper.get('input').classes()
|
|
||||||
expect(inputClasses).not.toContain('focus:pl-[11px]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps the bottom border allocation when open (transparent, not zero)', async () => {
|
|
||||||
const wrapper = mountComponent({options})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
|
|
||||||
const inputClasses = wrapper.get('input').classes()
|
|
||||||
// border-b-0 would shrink the bottom border to 0px and grow content area by 1px;
|
|
||||||
// border-b-transparent keeps the 1px allocation but hides the line
|
|
||||||
expect(inputClasses).not.toContain('!border-b-0')
|
|
||||||
expect(inputClasses).toContain('!border-b-transparent')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : chevron en text-m-muted', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir et icône noire', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true, modelValue: 'fr', options, iconName: 'mdi:magnify', iconPosition: 'left'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon-left"]').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', options})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', options, reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', options, reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -107,7 +107,7 @@
|
|||||||
{{ minSearchText }}
|
{{ minSearchText }}
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
v-else-if="filteredOptions.length === 0"
|
v-else-if="options.length === 0"
|
||||||
class="px-3 py-2 text-m-muted"
|
class="px-3 py-2 text-m-muted"
|
||||||
data-test="no-results-text"
|
data-test="no-results-text"
|
||||||
>
|
>
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
</li>
|
</li>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<li
|
<li
|
||||||
v-for="(opt, index) in filteredOptions"
|
v-for="(opt, index) in options"
|
||||||
:id="optionId(index)"
|
:id="optionId(index)"
|
||||||
:key="String(opt.value)"
|
:key="String(opt.value)"
|
||||||
data-test="option"
|
data-test="option"
|
||||||
@@ -136,12 +136,11 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError ? 'text-m-danger' : hasSuccess ? 'text-m-success' : 'text-m-muted',
|
hasError ? 'text-m-danger' : hasSuccess ? 'text-m-success' : 'text-m-muted',
|
||||||
'mt-1 ml-[2px] text-xs',
|
'mt-1 ml-[2px] text-xs',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -153,7 +152,6 @@
|
|||||||
import {computed, onBeforeUnmount, onMounted, ref, useAttrs, useId, watch} from 'vue'
|
import {computed, onBeforeUnmount, onMounted, ref, useAttrs, useId, watch} from 'vue'
|
||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
import {Icon as IconifyIcon} from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputAutocomplete', inheritAttrs: false})
|
defineOptions({name: 'MalioInputAutocomplete', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -182,7 +180,6 @@ const props = withDefaults(
|
|||||||
debounce?: number
|
debounce?: number
|
||||||
minSearchLength?: number
|
minSearchLength?: number
|
||||||
allowCreate?: boolean
|
allowCreate?: boolean
|
||||||
localFilter?: boolean
|
|
||||||
iconName?: string
|
iconName?: string
|
||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
@@ -190,7 +187,6 @@ const props = withDefaults(
|
|||||||
noResultsText?: string
|
noResultsText?: string
|
||||||
loadingText?: string
|
loadingText?: string
|
||||||
minSearchText?: string
|
minSearchText?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -211,7 +207,6 @@ const props = withDefaults(
|
|||||||
debounce: 300,
|
debounce: 300,
|
||||||
minSearchLength: 0,
|
minSearchLength: 0,
|
||||||
allowCreate: false,
|
allowCreate: false,
|
||||||
localFilter: false,
|
|
||||||
iconName: '',
|
iconName: '',
|
||||||
iconPosition: 'left',
|
iconPosition: 'left',
|
||||||
iconSize: 24,
|
iconSize: 24,
|
||||||
@@ -219,7 +214,6 @@ const props = withDefaults(
|
|||||||
noResultsText: 'Aucun résultat',
|
noResultsText: 'Aucun résultat',
|
||||||
loadingText: 'Chargement…',
|
loadingText: 'Chargement…',
|
||||||
minSearchText: 'Tapez pour rechercher',
|
minSearchText: 'Tapez pour rechercher',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -253,29 +247,15 @@ const hasSelection = computed(() =>
|
|||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
||||||
const isFilled = computed(() => inputValue.value.trim().length > 0 || hasSelection.value)
|
const isFilled = computed(() => inputValue.value.trim().length > 0 || hasSelection.value)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
const shouldFloatLabel = computed(() => isFocused.value || inputValue.value.length > 0)
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || inputValue.value.length > 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const showMinSearch = computed(() =>
|
const showMinSearch = computed(() =>
|
||||||
props.minSearchLength > 0 && inputValue.value.length < props.minSearchLength,
|
props.minSearchLength > 0 && inputValue.value.length < props.minSearchLength,
|
||||||
)
|
)
|
||||||
|
|
||||||
const filteredOptions = computed(() => {
|
|
||||||
if (!props.localFilter) return props.options
|
|
||||||
const query = inputValue.value.trim().toLowerCase()
|
|
||||||
if (query === '') return props.options
|
|
||||||
return props.options.filter(opt =>
|
|
||||||
opt.label.toLowerCase().includes(query),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
const optionId = (index: number) => `${inputId.value}-option-${index}`
|
const optionId = (index: number) => `${inputId.value}-option-${index}`
|
||||||
const activeOptionId = computed(() =>
|
const activeOptionId = computed(() =>
|
||||||
activeIndex.value >= 0 && filteredOptions.value[activeIndex.value]
|
activeIndex.value >= 0 && props.options[activeIndex.value]
|
||||||
? optionId(activeIndex.value)
|
? optionId(activeIndex.value)
|
||||||
: undefined,
|
: undefined,
|
||||||
)
|
)
|
||||||
@@ -314,17 +294,19 @@ const iconInputPaddingClass = computed(() => {
|
|||||||
return parts.join(' ')
|
return parts.join(' ')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const focusPaddingClass = computed(() => {
|
||||||
|
if (props.iconName && props.iconPosition === 'left') return 'focus:!pl-11'
|
||||||
|
return 'focus:pl-[11px]'
|
||||||
|
})
|
||||||
|
|
||||||
const labelPositionClass = computed(() =>
|
const labelPositionClass = computed(() =>
|
||||||
props.iconName && props.iconPosition === 'left' ? 'left-11' : 'left-3',
|
props.iconName && props.iconPosition === 'left' ? 'left-11' : 'left-3',
|
||||||
)
|
)
|
||||||
|
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
props.disabled
|
props.disabled
|
||||||
? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted'
|
? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted'
|
||||||
: 'cursor-text',
|
: 'cursor-text',
|
||||||
@@ -332,11 +314,11 @@ const mergedInputClass = computed(() =>
|
|||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
isOpen.value ? '!rounded-b-none !border-b-0' : '',
|
||||||
isOpen.value ? '!rounded-b-none !border-b-transparent' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
iconInputPaddingClass.value,
|
iconInputPaddingClass.value,
|
||||||
|
focusPaddingClass.value,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -344,15 +326,12 @@ const mergedLabelClass = computed(() =>
|
|||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
labelPositionClass.value,
|
labelPositionClass.value,
|
||||||
shouldFloatLabel.value ? '-translate-y-[1.25rem] scale-90' : '',
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
|
props.disabled ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: props.disabled
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -362,7 +341,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (props.disabled) return props.iconColor
|
if (props.disabled) return props.iconColor
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return props.iconColor
|
return props.iconColor
|
||||||
@@ -371,7 +349,6 @@ const iconStateClass = computed(() => {
|
|||||||
const chevronColorClass = computed(() => {
|
const chevronColorClass = computed(() => {
|
||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isOpen.value) return 'text-m-primary'
|
if (isOpen.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return 'text-m-muted'
|
return 'text-m-muted'
|
||||||
@@ -455,8 +432,8 @@ const onKeydown = (event: KeyboardEvent) => {
|
|||||||
|
|
||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
if (activeIndex.value >= 0 && filteredOptions.value[activeIndex.value]) {
|
if (activeIndex.value >= 0 && props.options[activeIndex.value]) {
|
||||||
onSelect(filteredOptions.value[activeIndex.value])
|
onSelect(props.options[activeIndex.value])
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (props.allowCreate && inputValue.value !== '') {
|
if (props.allowCreate && inputValue.value !== '') {
|
||||||
@@ -473,7 +450,7 @@ const onKeydown = (event: KeyboardEvent) => {
|
|||||||
if (!isOpen.value) {
|
if (!isOpen.value) {
|
||||||
isOpen.value = true
|
isOpen.value = true
|
||||||
}
|
}
|
||||||
activeIndex.value = Math.min(activeIndex.value + 1, filteredOptions.value.length - 1)
|
activeIndex.value = Math.min(activeIndex.value + 1, props.options.length - 1)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -504,7 +481,12 @@ onBeforeUnmount(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.grow-height {
|
.grow-height {
|
||||||
transition: border-color 160ms ease, box-shadow 160ms ease;
|
transition: border-color 160ms ease, box-shadow 160ms ease, padding-top 160ms ease, padding-bottom 160ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grow-height:focus {
|
||||||
|
padding-top: 0.625rem;
|
||||||
|
padding-bottom: 0.625rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ type InputEmailProps = {
|
|||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
lowercase?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputEmailForTest = InputEmail as DefineComponent<InputEmailProps>
|
const InputEmailForTest = InputEmail as DefineComponent<InputEmailProps>
|
||||||
@@ -54,16 +52,6 @@ describe('MalioInputEmail', () => {
|
|||||||
expect(wrapper.get('label').text()).toBe('Adresse email')
|
expect(wrapper.get('label').text()).toBe('Adresse email')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has type email', () => {
|
it('has type email', () => {
|
||||||
const wrapper = mountComponent()
|
const wrapper = mountComponent()
|
||||||
|
|
||||||
@@ -237,82 +225,4 @@ describe('MalioInputEmail', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('input').attributes('autocomplete')).toBe('email')
|
expect(wrapper.get('input').attributes('autocomplete')).toBe('email')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('supprime tous les espaces saisis', async () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
await wrapper.get('input').setValue(' a b @ c.com ')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['ab@c.com'])
|
|
||||||
expect(wrapper.get('input').element.value).toBe('ab@c.com')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('conserve la casse par défaut', async () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
await wrapper.get('input').setValue('User@Example.COM')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['User@Example.COM'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('met en minuscules quand lowercase est vrai', async () => {
|
|
||||||
const wrapper = mountComponent({lowercase: true})
|
|
||||||
await wrapper.get('input').setValue('User@Example.COM')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['user@example.com'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('émet la valeur sanitisée en mode contrôlé', async () => {
|
|
||||||
const wrapper = mountComponent({modelValue: ''})
|
|
||||||
await wrapper.get('input').setValue(' a b @ c.com ')
|
|
||||||
expect(wrapper.emitted('update:modelValue')!.at(-1)).toEqual(['ab@c.com'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('resynchronise le DOM en mode contrôlé même quand la valeur sanitisée égale déjà modelValue', async () => {
|
|
||||||
// L'utilisateur ajoute un espace en fin alors que la valeur nettoyée vaut déjà modelValue.
|
|
||||||
// Le parent ne « changera » pas modelValue → Vue ne re-patche pas le DOM ; l'écriture
|
|
||||||
// manuelle target.value = sanitized est donc indispensable pour retirer l'espace affiché.
|
|
||||||
const wrapper = mountComponent({modelValue: 'ab@c.com'})
|
|
||||||
const input = wrapper.get('input')
|
|
||||||
await input.setValue('ab@c.com ')
|
|
||||||
expect(input.element.value).toBe('ab@c.com')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir et icône noire', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true, modelValue: 'user@example.com'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -51,7 +51,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -64,7 +63,6 @@
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputEmail', inheritAttrs: false})
|
defineOptions({name: 'MalioInputEmail', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -88,8 +86,6 @@ const props = withDefaults(
|
|||||||
iconPosition?: 'left' | 'right'
|
iconPosition?: 'left' | 'right'
|
||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
lowercase?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -110,8 +106,6 @@ const props = withDefaults(
|
|||||||
success: '',
|
success: '',
|
||||||
iconSize: 24,
|
iconSize: 24,
|
||||||
iconColor: 'text-m-muted',
|
iconColor: 'text-m-muted',
|
||||||
lowercase: false,
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -123,15 +117,10 @@ const isFocused = ref(false)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-email-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-email-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'relative flex h-12 w-full items-center',
|
'relative flex h-12 w-full items-center',
|
||||||
@@ -140,38 +129,29 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
iconInputPaddingClass.value,
|
iconInputPaddingClass.value,
|
||||||
isReadonly.value ? '' : focusPaddingClass.value,
|
focusPaddingClass.value,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
const mergedLabelClass = computed(() =>
|
const mergedLabelClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
labelPositionClass.value,
|
labelPositionClass.value,
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -189,37 +169,12 @@ const emit = defineEmits<{
|
|||||||
(event: 'update:modelValue', value: string): void
|
(event: 'update:modelValue', value: string): void
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const sanitizeEmail = (v: string) => {
|
|
||||||
let out = v.replace(/\s+/g, '')
|
|
||||||
if (props.lowercase) out = out.toLowerCase()
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
const onInput = (event: Event) => {
|
const onInput = (event: Event) => {
|
||||||
const target = event.target as HTMLInputElement
|
const target = event.target as HTMLInputElement
|
||||||
const raw = target.value
|
|
||||||
const sanitized = sanitizeEmail(raw)
|
|
||||||
|
|
||||||
if (sanitized !== raw) {
|
|
||||||
// `<input type="email">` ne supporte pas l'API de sélection :
|
|
||||||
// selectionStart vaut null et setSelectionRange lève en navigateur.
|
|
||||||
// (En jsdom selectionStart peut renvoyer un nombre, d'où le code gardé ci-dessous.)
|
|
||||||
const caret = target.selectionStart
|
|
||||||
target.value = sanitized
|
|
||||||
if (caret !== null) {
|
|
||||||
const newCaret = sanitizeEmail(raw.slice(0, caret)).length
|
|
||||||
try {
|
|
||||||
target.setSelectionRange(newCaret, newCaret)
|
|
||||||
} catch {
|
|
||||||
/* type d'input sans support de sélection — ignore */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isControlled.value) {
|
if (!isControlled.value) {
|
||||||
localValue.value = sanitized
|
localValue.value = target.value
|
||||||
}
|
}
|
||||||
emit('update:modelValue', sanitized)
|
emit('update:modelValue', target.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
const iconInputPaddingClass = computed(() => {
|
const iconInputPaddingClass = computed(() => {
|
||||||
@@ -248,7 +203,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return props.iconColor
|
if (disabled.value) return props.iconColor
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return props.iconColor
|
return props.iconColor
|
||||||
|
|||||||
@@ -6,13 +6,9 @@ import InputNumber from './InputNumber.vue'
|
|||||||
type InputNumberProps = {
|
type InputNumberProps = {
|
||||||
modelValue?: string | null
|
modelValue?: string | null
|
||||||
label?: string
|
label?: string
|
||||||
required?: boolean
|
|
||||||
readonly?: boolean
|
readonly?: boolean
|
||||||
min?: number | string
|
min?: number | string
|
||||||
max?: number | string
|
max?: number | string
|
||||||
error?: string
|
|
||||||
hint?: string
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputNumberForTest = InputNumber as DefineComponent<InputNumberProps>
|
const InputNumberForTest = InputNumber as DefineComponent<InputNumberProps>
|
||||||
@@ -166,33 +162,4 @@ describe('MalioInputNumber', () => {
|
|||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual(['5'])
|
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual(['5'])
|
||||||
expect(input.element.value).toBe('5')
|
expect(input.element.value).toBe('5')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountInputNumber({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountInputNumber({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountInputNumber({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountInputNumber({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountInputNumber({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -60,7 +60,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'text-xs ml-[2px] ',
|
'text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -72,7 +71,6 @@
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
import {Icon as IconifyIcon} from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputNumber', inheritAttrs: false})
|
defineOptions({name: 'MalioInputNumber', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -93,7 +91,6 @@ const props = withDefaults(
|
|||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -111,7 +108,6 @@ const props = withDefaults(
|
|||||||
hint: '',
|
hint: '',
|
||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ type InputPasswordProps = {
|
|||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
displayIcon?: boolean
|
displayIcon?: boolean
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputPasswordForTest = InputPassword as DefineComponent<InputPasswordProps>
|
const InputPasswordForTest = InputPassword as DefineComponent<InputPasswordProps>
|
||||||
@@ -52,16 +51,6 @@ describe('MalioInputPassword', () => {
|
|||||||
expect(wrapper.get('label').text()).toBe('Mot de passe')
|
expect(wrapper.get('label').text()).toBe('Mot de passe')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has type password by default', () => {
|
it('has type password by default', () => {
|
||||||
const wrapper = mountComponent()
|
const wrapper = mountComponent()
|
||||||
|
|
||||||
@@ -196,55 +185,4 @@ describe('MalioInputPassword', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : icône en text-m-muted', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir et icône noire', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true, modelValue: 'secret'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : eye toggle reste cliquable', async () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
await wrapper.get('[data-test="icon"]').trigger('click')
|
|
||||||
expect(wrapper.get('input').attributes('type')).toBe('text')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -56,7 +56,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -69,7 +68,6 @@
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputPassword', inheritAttrs: false})
|
defineOptions({name: 'MalioInputPassword', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -92,7 +90,6 @@ const props = withDefaults(
|
|||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
displayIcon?: boolean
|
displayIcon?: boolean
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -112,7 +109,6 @@ const props = withDefaults(
|
|||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
displayIcon: true,
|
displayIcon: true,
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -129,15 +125,10 @@ const toggleVisibility = () => {
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-password-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-password-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'relative flex h-12 w-full items-center',
|
'relative flex h-12 w-full items-center',
|
||||||
@@ -146,20 +137,16 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
props.displayIcon ? '!pr-10' : '',
|
props.displayIcon ? '!pr-10' : '',
|
||||||
isReadonly.value ? '' : 'focus:pl-[11px]',
|
'focus:pl-[11px]',
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -167,17 +154,12 @@ const mergedLabelClass = computed(() =>
|
|||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
'left-3',
|
'left-3',
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -209,7 +191,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return 'text-m-muted'
|
if (disabled.value) return 'text-m-muted'
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return 'text-m-muted'
|
return 'text-m-muted'
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ type InputPhoneProps = {
|
|||||||
addable?: boolean
|
addable?: boolean
|
||||||
addIconName?: string
|
addIconName?: string
|
||||||
addButtonLabel?: string
|
addButtonLabel?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputPhoneForTest = InputPhone as DefineComponent<InputPhoneProps>
|
const InputPhoneForTest = InputPhone as DefineComponent<InputPhoneProps>
|
||||||
@@ -57,16 +56,6 @@ describe('MalioInputPhone', () => {
|
|||||||
expect(wrapper.get('label').text()).toBe('Téléphone')
|
expect(wrapper.get('label').text()).toBe('Téléphone')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has type tel', () => {
|
it('has type tel', () => {
|
||||||
const wrapper = mountComponent()
|
const wrapper = mountComponent()
|
||||||
|
|
||||||
@@ -275,43 +264,10 @@ describe('MalioInputPhone', () => {
|
|||||||
expect(wrapper.get('[data-test="add-button"]').attributes('disabled')).toBeDefined()
|
expect(wrapper.get('[data-test="add-button"]').attributes('disabled')).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('add button is not natively disabled in readonly (onAdd guard blocks the action)', () => {
|
it('disables add button when readonly', () => {
|
||||||
const wrapper = mountComponent({addable: true, readonly: true})
|
const wrapper = mountComponent({addable: true, readonly: true})
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').attributes('disabled')).toBeUndefined()
|
expect(wrapper.get('[data-test="add-button"]').attributes('disabled')).toBeDefined()
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : border-black appliqué sur l\'input', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', readonly: true})
|
|
||||||
expect(wrapper.get('input').classes()).toContain('border-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : icône en text-m-muted quand vide', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', readonly: true})
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : icône en text-black quand rempli', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', readonly: true, modelValue: '+33612345678'})
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : pas d\'apparence désactivée (pas opacity-40)', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', addable: true, readonly: true})
|
|
||||||
// opacity-40 was only ever applied to the add button, not the input
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).not.toContain('opacity-40')
|
|
||||||
// and the input is not natively disabled in readonly:
|
|
||||||
expect(wrapper.get('input').attributes('disabled')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label en text-m-muted', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', readonly: true})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label en text-black', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Tel', readonly: true, modelValue: '+33612345678'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders the default add icon (mdi:plus)', () => {
|
it('renders the default add icon (mdi:plus)', () => {
|
||||||
@@ -342,41 +298,6 @@ describe('MalioInputPhone', () => {
|
|||||||
expect(wrapper.get('input').classes()).toContain('!pr-10')
|
expect(wrapper.get('input').classes()).toContain('!pr-10')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('shows default add button color when empty and unfocused', () => {
|
|
||||||
const wrapper = mountComponent({addable: true})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).toContain('text-m-muted')
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).not.toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows primary add button color on focus', async () => {
|
|
||||||
const wrapper = mountComponent({addable: true})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows black add button color when filled and unfocused', () => {
|
|
||||||
const wrapper = mountComponent({addable: true, modelValue: '+33612345678'})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('error overrides focus color on add button', async () => {
|
|
||||||
const wrapper = mountComponent({addable: true, error: 'Numéro invalide'})
|
|
||||||
|
|
||||||
await wrapper.get('input').trigger('focus')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).toContain('text-m-danger')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('success applies to add button', () => {
|
|
||||||
const wrapper = mountComponent({addable: true, success: 'Numéro valide'})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="add-button"]').classes()).toContain('text-m-success')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies mask via maska directive', async () => {
|
it('applies mask via maska directive', async () => {
|
||||||
const wrapper = mountComponent({mask: '+## # ## ## ## ##'})
|
const wrapper = mountComponent({mask: '+## # ## ## ## ##'})
|
||||||
|
|
||||||
@@ -384,23 +305,4 @@ describe('MalioInputPhone', () => {
|
|||||||
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeDefined()
|
expect(wrapper.emitted('update:modelValue')).toBeDefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
<button
|
<button
|
||||||
v-if="addable"
|
v-if="addable"
|
||||||
type="button"
|
type="button"
|
||||||
:disabled="disabled"
|
:disabled="disabled || readonly"
|
||||||
:aria-label="addButtonLabel"
|
:aria-label="addButtonLabel"
|
||||||
data-test="add-button"
|
data-test="add-button"
|
||||||
:class="mergedAddButtonClass"
|
:class="mergedAddButtonClass"
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -69,7 +69,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -84,7 +83,6 @@ import {vMaska} from 'maska/vue'
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputPhone', inheritAttrs: false})
|
defineOptions({name: 'MalioInputPhone', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -112,7 +110,6 @@ const props = withDefaults(
|
|||||||
addable?: boolean
|
addable?: boolean
|
||||||
addIconName?: string
|
addIconName?: string
|
||||||
addButtonLabel?: string
|
addButtonLabel?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -137,7 +134,6 @@ const props = withDefaults(
|
|||||||
addable: false,
|
addable: false,
|
||||||
addIconName: 'mdi:plus',
|
addIconName: 'mdi:plus',
|
||||||
addButtonLabel: 'Ajouter un numéro',
|
addButtonLabel: 'Ajouter un numéro',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -149,15 +145,10 @@ const isFocused = ref(false)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-phone-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-phone-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'relative flex h-12 w-full items-center',
|
'relative flex h-12 w-full items-center',
|
||||||
@@ -166,38 +157,29 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
iconInputPaddingClass.value,
|
iconInputPaddingClass.value,
|
||||||
isReadonly.value ? '' : focusPaddingClass.value,
|
focusPaddingClass.value,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
const mergedLabelClass = computed(() =>
|
const mergedLabelClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
labelPositionClass.value,
|
labelPositionClass.value,
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -205,9 +187,8 @@ const mergedLabelClass = computed(() =>
|
|||||||
|
|
||||||
const mergedAddButtonClass = computed(() =>
|
const mergedAddButtonClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'absolute right-[10px] top-1/2 -translate-y-1/2 cursor-pointer transition-opacity hover:opacity-70',
|
'absolute right-[10px] top-1/2 -translate-y-1/2 cursor-pointer text-m-primary transition-opacity hover:opacity-70',
|
||||||
iconStateClass.value,
|
(props.disabled || props.readonly) ? 'cursor-not-allowed opacity-40 hover:opacity-40' : '',
|
||||||
props.disabled ? 'cursor-not-allowed opacity-40 hover:opacity-40' : '',
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -267,7 +248,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return props.iconColor
|
if (disabled.value) return props.iconColor
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return props.iconColor
|
return props.iconColor
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ type InputRichTextProps = {
|
|||||||
groupClass?: string
|
groupClass?: string
|
||||||
labelClass?: string
|
labelClass?: string
|
||||||
editorClass?: string
|
editorClass?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputRichTextForTest = InputRichText as DefineComponent<InputRichTextProps>
|
const InputRichTextForTest = InputRichText as DefineComponent<InputRichTextProps>
|
||||||
@@ -157,18 +155,6 @@ describe('MalioInputRichText', () => {
|
|||||||
expect(editorContent.attributes('aria-describedby')).toBe('rt-aria-describedby')
|
expect(editorContent.attributes('aria-describedby')).toBe('rt-aria-describedby')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('expose aria-required quand required est vrai', async () => {
|
|
||||||
const wrapper = await mountComponent({required: true})
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'expose pas aria-required par défaut', async () => {
|
|
||||||
const wrapper = await mountComponent()
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders initial markdown content visually', async () => {
|
it('renders initial markdown content visually', async () => {
|
||||||
const wrapper = await mountComponent({modelValue: '## Mon titre\n\nUn paragraphe.'})
|
const wrapper = await mountComponent({modelValue: '## Mon titre\n\nUn paragraphe.'})
|
||||||
|
|
||||||
@@ -176,35 +162,4 @@ describe('MalioInputRichText', () => {
|
|||||||
expect(html).toContain('Mon titre')
|
expect(html).toContain('Mon titre')
|
||||||
expect(html).toContain('Un paragraphe.')
|
expect(html).toContain('Un paragraphe.')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', async () => {
|
|
||||||
const wrapper = await mountComponent({label: 'Champ', required: true})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', async () => {
|
|
||||||
const wrapper = await mountComponent({label: 'Champ'})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', async () => {
|
|
||||||
const wrapper = await mountComponent({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', async () => {
|
|
||||||
const wrapper = await mountComponent({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', async () => {
|
|
||||||
const wrapper = await mountComponent({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
:for="editorId"
|
:for="editorId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<!-- Mode lecture seule (rendu uniquement) -->
|
<!-- Mode lecture seule (rendu uniquement) -->
|
||||||
@@ -22,7 +22,6 @@
|
|||||||
v-else
|
v-else
|
||||||
:id="editorId"
|
:id="editorId"
|
||||||
:class="mergedEditorWrapperClass"
|
:class="mergedEditorWrapperClass"
|
||||||
:aria-required="required || undefined"
|
|
||||||
@click="focusEditor"
|
@click="focusEditor"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -185,7 +184,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${editorId}-describedby`"
|
:id="`${editorId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -194,7 +193,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px]',
|
'mt-1 text-xs ml-[2px]',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
@@ -213,7 +211,6 @@ import Color from '@tiptap/extension-color'
|
|||||||
import Highlight from '@tiptap/extension-highlight'
|
import Highlight from '@tiptap/extension-highlight'
|
||||||
import { Markdown } from 'tiptap-markdown'
|
import { Markdown } from 'tiptap-markdown'
|
||||||
import { twMerge } from 'tailwind-merge'
|
import { twMerge } from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'MalioInputRichText', inheritAttrs: false })
|
defineOptions({ name: 'MalioInputRichText', inheritAttrs: false })
|
||||||
|
|
||||||
@@ -236,8 +233,6 @@ const props = withDefaults(
|
|||||||
groupClass?: string
|
groupClass?: string
|
||||||
labelClass?: string
|
labelClass?: string
|
||||||
editorClass?: string
|
editorClass?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -255,8 +250,6 @@ const props = withDefaults(
|
|||||||
groupClass: '',
|
groupClass: '',
|
||||||
labelClass: '',
|
labelClass: '',
|
||||||
editorClass: '',
|
editorClass: '',
|
||||||
required: false,
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -286,11 +279,10 @@ const mergedLabelClass = computed(() =>
|
|||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: props.disabled
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isFocused.value
|
: isFocused.value
|
||||||
? 'text-m-primary'
|
? 'text-m-primary'
|
||||||
: 'text-m-text',
|
: 'text-m-text',
|
||||||
|
props.disabled ? 'text-black/60' : '',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -53,7 +53,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -68,7 +67,6 @@ import {vMaska} from 'maska/vue'
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputText', inheritAttrs: false})
|
defineOptions({name: 'MalioInputText', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -96,7 +94,6 @@ const props = withDefaults(
|
|||||||
iconSize?: string | number
|
iconSize?: string | number
|
||||||
iconColor?: string
|
iconColor?: string
|
||||||
mask?: string | MaskInputOptions
|
mask?: string | MaskInputOptions
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -120,7 +117,6 @@ const props = withDefaults(
|
|||||||
iconSize: 24,
|
iconSize: 24,
|
||||||
iconColor: 'text-m-muted',
|
iconColor: 'text-m-muted',
|
||||||
mask: undefined,
|
mask: undefined,
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -132,15 +128,10 @@ const isFocused = ref(false)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-text-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-text-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'relative flex h-12 w-full items-center',
|
'relative flex h-12 w-full items-center',
|
||||||
@@ -149,38 +140,29 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-text',
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
iconInputPaddingClass.value,
|
iconInputPaddingClass.value,
|
||||||
isReadonly.value ? '' : focusPaddingClass.value,
|
focusPaddingClass.value,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
const mergedLabelClass = computed(() =>
|
const mergedLabelClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
labelPositionClass.value,
|
labelPositionClass.value,
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -232,7 +214,6 @@ const iconStateClass = computed(() => {
|
|||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return props.iconColor
|
if (disabled.value) return props.iconColor
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return props.iconColor
|
return props.iconColor
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ type InputTextAreaProps = {
|
|||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
rounded?: string
|
rounded?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputTextAreaForTest = InputTextArea as DefineComponent<InputTextAreaProps>
|
const InputTextAreaForTest = InputTextArea as DefineComponent<InputTextAreaProps>
|
||||||
@@ -150,87 +149,4 @@ describe('MalioInputTextArea', () => {
|
|||||||
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
|
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
|
||||||
expect(wrapper.get('p.text-m-danger').text()).toBe('Textarea error')
|
expect(wrapper.get('p.text-m-danger').text()).toBe('Textarea error')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('renders as a single root element (works as a single grid item)', () => {
|
|
||||||
const host = document.createElement('div')
|
|
||||||
document.body.appendChild(host)
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {
|
|
||||||
attachTo: host,
|
|
||||||
})
|
|
||||||
|
|
||||||
// host > div[data-v-app] > component roots
|
|
||||||
const app = host.firstElementChild as HTMLElement
|
|
||||||
expect(app.children.length).toBe(1)
|
|
||||||
|
|
||||||
wrapper.unmount()
|
|
||||||
host.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies primary scrollbar class on focus', async () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest)
|
|
||||||
|
|
||||||
expect(wrapper.get('textarea').classes()).not.toContain('textarea-scrollbar-primary')
|
|
||||||
|
|
||||||
await wrapper.get('textarea').trigger('focus')
|
|
||||||
|
|
||||||
expect(wrapper.get('textarea').classes()).toContain('textarea-scrollbar-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('removes primary scrollbar class on blur', async () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest)
|
|
||||||
|
|
||||||
await wrapper.get('textarea').trigger('focus')
|
|
||||||
await wrapper.get('textarea').trigger('blur')
|
|
||||||
|
|
||||||
expect(wrapper.get('textarea').classes()).not.toContain('textarea-scrollbar-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', required: true}})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ'}})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de bleu', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', readonly: true}})
|
|
||||||
const field = wrapper.get('textarea')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu focus', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', readonly: true}})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-m-muted')
|
|
||||||
// En readonly, pas de couleur primary sur le label
|
|
||||||
expect(wrapper.get('label').classes()).not.toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', readonly: true, modelValue: 'du texte'}})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ'}})
|
|
||||||
const msg = wrapper.find('[data-test="message-line"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', reserveMessageSpace: false}})
|
|
||||||
expect(wrapper.find('[data-test="message-line"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mount(InputTextAreaForTest, {props: {label: 'Champ', reserveMessageSpace: false, error: 'Erreur'}})
|
|
||||||
const msg = wrapper.find('[data-test="message-line"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="mergedGroupClass">
|
<div :class="mergedGroupClass">
|
||||||
<div class="relative w-full flex-1">
|
|
||||||
<textarea
|
<textarea
|
||||||
:id="inputId"
|
:id="inputId"
|
||||||
:name="name"
|
:name="name"
|
||||||
@@ -8,14 +7,13 @@
|
|||||||
:autocomplete="autocomplete"
|
:autocomplete="autocomplete"
|
||||||
class="floating-input peer w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent overflow-auto"
|
class="floating-input peer w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent overflow-auto"
|
||||||
:class="[
|
:class="[
|
||||||
isReadonly ? 'border-black' : (isFilled ? 'border-black' : 'border-m-muted'),
|
isFilled ? 'border-black' : 'border-m-muted',
|
||||||
disabled ? 'cursor-not-allowed text-black/60 border-m-muted' : (isReadonly ? 'cursor-default' : 'cursor-text'),
|
disabled ? 'cursor-not-allowed text-black/60 border-m-muted' : 'cursor-text',
|
||||||
hasError
|
hasError
|
||||||
? 'border-m-danger focus:border-m-danger'
|
? 'border-m-danger focus:border-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'border-m-success focus:border-m-success'
|
? 'border-m-success focus:border-m-success'
|
||||||
: isReadonly ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
isReadonly ? '' : (isFocused ? 'textarea-scrollbar-primary' : ''),
|
|
||||||
textInput,
|
textInput,
|
||||||
showCounterComputed ? 'pb-6' : '',
|
showCounterComputed ? 'pb-6' : '',
|
||||||
rounded,
|
rounded,
|
||||||
@@ -41,19 +39,16 @@
|
|||||||
class="floating-label absolute left-3 top-2 mt-1 inline-block origin-left transition-transform duration-150 font-medium"
|
class="floating-label absolute left-3 top-2 mt-1 inline-block origin-left transition-transform duration-150 font-medium"
|
||||||
:class="[
|
:class="[
|
||||||
shouldFloatLabel ? '-translate-y-[1.30rem] scale-90' : '',
|
shouldFloatLabel ? '-translate-y-[1.30rem] scale-90' : '',
|
||||||
|
disabled ? 'text-black/60' : '',
|
||||||
hasError
|
hasError
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled
|
: isFocused ? 'text-m-primary' : shouldFloatLabel ? 'text-black' : 'text-m-muted',
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly
|
|
||||||
? (isFilled ? 'text-black' : 'text-m-muted')
|
|
||||||
: (isFocused ? 'text-m-primary' : shouldFloatLabel ? 'text-black' : 'text-m-muted'),
|
|
||||||
textLabel,
|
textLabel,
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
<span
|
<span
|
||||||
v-if="showCounterComputed"
|
v-if="showCounterComputed"
|
||||||
@@ -63,10 +58,8 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hasError || hasSuccess || hint"
|
||||||
data-test="message-line"
|
|
||||||
class="mt-1 flex items-center justify-between gap-2 text-xs"
|
class="mt-1 flex items-center justify-between gap-2 text-xs"
|
||||||
:class="reserveMessageSpace ? 'min-h-[1rem]' : ''"
|
|
||||||
>
|
>
|
||||||
<p
|
<p
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
@@ -82,13 +75,11 @@
|
|||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputTextArea', inheritAttrs: false})
|
defineOptions({name: 'MalioInputTextArea', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -117,7 +108,6 @@ const props = withDefaults(
|
|||||||
success?: string
|
success?: string
|
||||||
rounded?: string
|
rounded?: string
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
@@ -144,14 +134,11 @@ const props = withDefaults(
|
|||||||
minResizeHeight: 40,
|
minResizeHeight: 40,
|
||||||
maxResizeHeight: 320,
|
maxResizeHeight: 320,
|
||||||
groupClass: '',
|
groupClass: '',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
// pt-1 (4px) aligne le haut de la textarea avec les inputs floating-label,
|
twMerge('relative w-full', props.groupClass),
|
||||||
// qui centrent un champ de 40px dans un groupe h-12 (≈ 4px de décalage en haut).
|
|
||||||
twMerge('flex flex-col w-full pt-1', props.groupClass),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const attrs = useAttrs()
|
const attrs = useAttrs()
|
||||||
@@ -162,15 +149,9 @@ const isFocused = ref(false)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-textarea-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-textarea-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
||||||
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const rowsCount = computed(() => Math.max(1, Number(props.size || 3)))
|
const rowsCount = computed(() => Math.max(1, Number(props.size || 3)))
|
||||||
const currentLength = computed(() => (currentValue.value ?? '').length)
|
const currentLength = computed(() => (currentValue.value ?? '').length)
|
||||||
const showCounterComputed = computed(() =>
|
const showCounterComputed = computed(() =>
|
||||||
@@ -184,6 +165,7 @@ const textareaStyle = computed(() => ({
|
|||||||
minHeight: toCssSize(props.minResizeHeight),
|
minHeight: toCssSize(props.minResizeHeight),
|
||||||
maxHeight: toCssSize(props.maxResizeHeight),
|
maxHeight: toCssSize(props.maxResizeHeight),
|
||||||
}))
|
}))
|
||||||
|
const isFilled = computed(() => currentValue.value.trim().length > 0)
|
||||||
const describedBy = computed(() =>
|
const describedBy = computed(() =>
|
||||||
(hasError.value || hasSuccess.value || !!props.hint) ? `${inputId.value}-describedby` : undefined,
|
(hasError.value || hasSuccess.value || !!props.hint) ? `${inputId.value}-describedby` : undefined,
|
||||||
)
|
)
|
||||||
@@ -206,8 +188,4 @@ const onInput = (event: Event) => {
|
|||||||
background: white;
|
background: white;
|
||||||
padding: 0 0.25rem;
|
padding: 0 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.textarea-scrollbar-primary {
|
|
||||||
scrollbar-color: rgb(var(--m-primary)) transparent;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import {describe, expect, it, vi} from 'vitest'
|
import {describe, expect, it} from 'vitest'
|
||||||
import {mount} from '@vue/test-utils'
|
import {mount} from '@vue/test-utils'
|
||||||
import type {DefineComponent} from 'vue'
|
import type {DefineComponent} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
@@ -12,14 +12,11 @@ type InputUploadProps = {
|
|||||||
labelClass?: string
|
labelClass?: string
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
displayIcon?: boolean
|
displayIcon?: boolean
|
||||||
accept?: string
|
accept?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputUploadForTest = InputUpload as DefineComponent<InputUploadProps>
|
const InputUploadForTest = InputUpload as DefineComponent<InputUploadProps>
|
||||||
@@ -170,11 +167,6 @@ describe('MalioInputUpload', () => {
|
|||||||
expect(wrapper.get('input[type="text"]').attributes('aria-invalid')).toBe('false')
|
expect(wrapper.get('input[type="text"]').attributes('aria-invalid')).toBe('false')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('expose aria-required sur le champ visible quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.get('input[type="text"]').attributes('aria-required')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('passes accept attribute to file input', () => {
|
it('passes accept attribute to file input', () => {
|
||||||
const wrapper = mountComponent({accept: '.pdf,.doc'})
|
const wrapper = mountComponent({accept: '.pdf,.doc'})
|
||||||
|
|
||||||
@@ -194,70 +186,4 @@ describe('MalioInputUpload', () => {
|
|||||||
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', required: true})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const field = wrapper.get('input[type="text"]')
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('grow-height')
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : icône en text-m-muted', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir + icône noire', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true, modelValue: 'fichier.pdf'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly empêche l\'ouverture du sélecteur de fichier', async () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', readonly: true})
|
|
||||||
const fileInput = wrapper.get('input[type="file"]').element as HTMLInputElement
|
|
||||||
const clickSpy = vi.spyOn(fileInput, 'click')
|
|
||||||
await wrapper.get('input[type="text"]').trigger('click')
|
|
||||||
expect(clickSpy).not.toHaveBeenCalled()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountComponent({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
:accept="accept"
|
:accept="accept"
|
||||||
class="hidden"
|
class="hidden"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:required="required"
|
|
||||||
@change="onFileChange"
|
@change="onFileChange"
|
||||||
>
|
>
|
||||||
|
|
||||||
@@ -20,7 +19,6 @@
|
|||||||
:value="currentDisplayValue"
|
:value="currentDisplayValue"
|
||||||
:readonly="true"
|
:readonly="true"
|
||||||
:aria-invalid="!!error"
|
:aria-invalid="!!error"
|
||||||
:aria-required="required || undefined"
|
|
||||||
:aria-describedby="describedBy"
|
:aria-describedby="describedBy"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
placeholder="_"
|
placeholder="_"
|
||||||
@@ -35,7 +33,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<IconifyIcon
|
<IconifyIcon
|
||||||
@@ -52,7 +50,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -61,7 +59,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 text-xs ml-[2px] ',
|
'mt-1 text-xs ml-[2px] ',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ hint || error || success }}
|
{{ hint || error || success }}
|
||||||
@@ -74,7 +71,6 @@
|
|||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
import { Icon as IconifyIcon } from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioInputUpload', inheritAttrs: false})
|
defineOptions({name: 'MalioInputUpload', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -87,14 +83,11 @@ const props = withDefaults(
|
|||||||
labelClass?: string
|
labelClass?: string
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
displayIcon?: boolean
|
displayIcon?: boolean
|
||||||
accept?: string
|
accept?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -104,14 +97,11 @@ const props = withDefaults(
|
|||||||
labelClass: '',
|
labelClass: '',
|
||||||
groupClass: '',
|
groupClass: '',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
readonly: false,
|
|
||||||
hint: '',
|
hint: '',
|
||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
displayIcon: true,
|
displayIcon: true,
|
||||||
accept: '',
|
accept: '',
|
||||||
required: false,
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -124,16 +114,10 @@ const fileInputRef = ref<HTMLInputElement | null>(null)
|
|||||||
const inputId = computed(() => props.id?.toString() || `malio-input-upload-${generatedId}`)
|
const inputId = computed(() => props.id?.toString() || `malio-input-upload-${generatedId}`)
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
const isControlled = computed(() => props.modelValue !== undefined)
|
||||||
const currentDisplayValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
const currentDisplayValue = computed(() => (isControlled.value ? (props.modelValue ?? '') : localValue.value))
|
||||||
|
const shouldFloatLabel = computed(() => isFocused.value || currentDisplayValue.value.length > 0)
|
||||||
const hasError = computed(() => !!props.error)
|
const hasError = computed(() => !!props.error)
|
||||||
const hasSuccess = computed(() => !!props.success)
|
const hasSuccess = computed(() => !!props.success)
|
||||||
const isFilled = computed(() => currentDisplayValue.value.trim().length > 0)
|
const isFilled = computed(() => currentDisplayValue.value.trim().length > 0)
|
||||||
const disabled = computed(() => props.disabled)
|
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
|
||||||
isReadonly.value
|
|
||||||
? isFilled.value
|
|
||||||
: isFocused.value || currentDisplayValue.value.length > 0,
|
|
||||||
)
|
|
||||||
const mergedGroupClass = computed(() =>
|
const mergedGroupClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'relative flex h-12 w-full items-center',
|
'relative flex h-12 w-full items-center',
|
||||||
@@ -142,21 +126,16 @@ const mergedGroupClass = computed(() =>
|
|||||||
)
|
)
|
||||||
const mergedInputClass = computed(() =>
|
const mergedInputClass = computed(() =>
|
||||||
twMerge(
|
twMerge(
|
||||||
'floating-input peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md cursor-pointer',
|
'floating-input grow-height peer min-h-[40px] w-full border bg-white pl-3 pr-3 py-1 outline-none placeholder:text-transparent text-lg rounded-md',
|
||||||
isReadonly.value ? '' : 'grow-height',
|
isFilled.value ? 'border-black' : 'border-m-muted',
|
||||||
isReadonly.value
|
disabled.value ? 'cursor-not-allowed text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : 'cursor-pointer',
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
disabled.value ? 'text-black/60 [&:not(:placeholder-shown)]:border-m-muted border-m-muted' : '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
? 'border-m-danger focus:border-m-danger [&:not(:placeholder-shown)]:border-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
? 'border-m-success focus:border-m-success [&:not(:placeholder-shown)]:border-m-success'
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
: 'focus:border-m-primary',
|
||||||
props.displayIcon ? '!pr-10' : '',
|
props.displayIcon ? '!pr-10' : '',
|
||||||
isReadonly.value ? '' : 'focus:pl-[11px]',
|
'focus:pl-[11px]',
|
||||||
isReadonly.value ? 'cursor-default' : '',
|
|
||||||
disabled.value ? 'cursor-not-allowed' : '',
|
|
||||||
props.inputClass,
|
props.inputClass,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -164,17 +143,12 @@ const mergedLabelClass = computed(() =>
|
|||||||
twMerge(
|
twMerge(
|
||||||
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
'floating-label absolute top-2 mt-[5px] inline-block origin-left transition-transform duration-150 font-medium text-sm',
|
||||||
'left-3',
|
'left-3',
|
||||||
shouldFloatLabel.value
|
shouldFloatLabel.value ? '-translate-y-[1.25rem] peer-focus:-translate-y-[1.55rem] scale-90' : '',
|
||||||
? `-translate-y-[1.25rem] scale-90${isReadonly.value ? '' : ' peer-focus:-translate-y-[1.55rem]'}`
|
disabled.value ? 'peer-[&:not(:placeholder-shown):not(:focus)]:text-black/60' : '',
|
||||||
: '',
|
|
||||||
hasError.value
|
hasError.value
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess.value
|
: hasSuccess.value
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled.value
|
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
: 'peer-placeholder-shown:text-m-muted peer-[&:not(:placeholder-shown):not(:focus)]:text-black peer-focus:text-m-primary',
|
||||||
props.labelClass,
|
props.labelClass,
|
||||||
),
|
),
|
||||||
@@ -194,7 +168,7 @@ const emit = defineEmits<{
|
|||||||
}>()
|
}>()
|
||||||
|
|
||||||
const openFilePicker = () => {
|
const openFilePicker = () => {
|
||||||
if (props.disabled || props.readonly) return
|
if (props.disabled) return
|
||||||
fileInputRef.value?.click()
|
fileInputRef.value?.click()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,11 +185,12 @@ const onFileChange = (event: Event) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const disabled = computed(() => props.disabled)
|
||||||
|
|
||||||
const iconStateClass = computed(() => {
|
const iconStateClass = computed(() => {
|
||||||
if (hasError.value) return 'text-m-danger'
|
if (hasError.value) return 'text-m-danger'
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
if (hasSuccess.value) return 'text-m-success'
|
||||||
if (disabled.value) return 'text-m-muted'
|
if (disabled.value) return 'text-m-muted'
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isFocused.value) return 'text-m-primary'
|
if (isFocused.value) return 'text-m-primary'
|
||||||
if (isFilled.value) return 'text-black'
|
if (isFilled.value) return 'text-black'
|
||||||
return 'text-m-muted'
|
return 'text-m-muted'
|
||||||
|
|||||||
@@ -1,320 +0,0 @@
|
|||||||
import { afterEach, describe, expect, it } from 'vitest'
|
|
||||||
import { enableAutoUnmount, mount } from '@vue/test-utils'
|
|
||||||
import type { DefineComponent } from 'vue'
|
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
|
||||||
import Modal from './Modal.vue'
|
|
||||||
|
|
||||||
type ModalProps = {
|
|
||||||
id?: string
|
|
||||||
modelValue?: boolean
|
|
||||||
showClose?: boolean
|
|
||||||
dismissable?: boolean
|
|
||||||
closeOnEscape?: boolean
|
|
||||||
ariaLabel?: string
|
|
||||||
modalClass?: string
|
|
||||||
overlayClass?: string
|
|
||||||
headerClass?: string
|
|
||||||
bodyClass?: string
|
|
||||||
footerClass?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const ModalForTest = Modal as DefineComponent<ModalProps>
|
|
||||||
|
|
||||||
function mountComponent(props: ModalProps = {}, slots?: Record<string, string>) {
|
|
||||||
return mount(ModalForTest, {
|
|
||||||
props,
|
|
||||||
slots,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('MalioModal', () => {
|
|
||||||
enableAutoUnmount(afterEach)
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render when modelValue is false', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: false })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the panel when modelValue is true', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('centers the modal (items-center justify-center)', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const root = wrapper.find('.fixed')
|
|
||||||
expect(root.classes()).toContain('items-center')
|
|
||||||
expect(root.classes()).toContain('justify-center')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders default slot in the body', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ default: '<p data-test="content">Contenu</p>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="body"] [data-test="content"]').text()).toBe('Contenu')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('works in uncontrolled mode (defaults closed)', () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('uses custom id when provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, id: 'my-modal' })
|
|
||||||
expect(wrapper.find('.fixed').attributes('id')).toBe('my-modal')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('generates an id when not provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('.fixed').attributes('id')).toMatch(/^malio-modal-/)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has role="dialog" and aria-modal on the panel', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('role')).toBe('dialog')
|
|
||||||
expect(panel.attributes('aria-modal')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies modalClass to the panel', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, modalClass: 'max-w-2xl' })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').classes()).toContain('max-w-2xl')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the #header slot inside the header bar', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ header: '<h2 data-test="title">Titre</h2>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="header"] [data-test="title"]').text()).toBe('Titre')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the header bar when showClose is true even without #header', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="header"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render the header bar when no #header and showClose is false', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, showClose: false })
|
|
||||||
expect(wrapper.find('[data-test="header"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows the close button by default', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('hides the close button when showClose is false', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, showClose: false },
|
|
||||||
{ header: '<h2>Titre</h2>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('close button renders mdi:cancel-bold icon', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const icon = wrapper.findComponent(IconifyIcon)
|
|
||||||
expect(icon.props('icon')).toBe('mdi:cancel-bold')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('close button has aria-label "Fermer"', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').attributes('aria-label')).toBe('Fermer')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue false and close on close button click', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="close-button"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets aria-labelledby to the header id when #header is provided', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, id: 'test-modal' },
|
|
||||||
{ header: '<h2>Titre</h2>' },
|
|
||||||
)
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('aria-labelledby')).toBe('test-modal-header')
|
|
||||||
expect(wrapper.find('[data-test="header-content"]').attributes('id')).toBe('test-modal-header')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets aria-label from ariaLabel when no #header is provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, ariaLabel: 'Boîte de dialogue' })
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('aria-label')).toBe('Boîte de dialogue')
|
|
||||||
expect(panel.attributes('aria-labelledby')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies headerClass to the header bar', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, headerClass: 'bg-m-primary' })
|
|
||||||
expect(wrapper.find('[data-test="header"]').classes()).toContain('bg-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the #footer slot in a footer pinned below the body', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ footer: '<button data-test="save">Enregistrer</button>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="body"] [data-test="footer"]').exists()).toBe(false)
|
|
||||||
expect(wrapper.find('[data-test="footer"] [data-test="save"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render the footer when no #footer slot', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="footer"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies bodyClass to the body', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, bodyClass: 'px-10' })
|
|
||||||
expect(wrapper.find('[data-test="body"]').classes()).toContain('px-10')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies footerClass to the footer', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, footerClass: 'justify-end' },
|
|
||||||
{ footer: '<span>pied</span>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="footer"]').classes()).toContain('justify-end')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue false and close on backdrop click (dismissable)', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="backdrop"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not close on backdrop click when dismissable is false', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, dismissable: false })
|
|
||||||
await wrapper.find('[data-test="backdrop"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies overlayClass to the backdrop', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, overlayClass: 'bg-black/70' })
|
|
||||||
expect(wrapper.find('[data-test="backdrop"]').classes()).toContain('bg-black/70')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('closes on Escape key when closeOnEscape is true', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Escape' })
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not close on Escape when closeOnEscape is false', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, closeOnEscape: false })
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Escape' })
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('locks body scroll when opened and restores it when closed', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
await wrapper.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('moves focus into the panel when opened', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false, showClose: false },
|
|
||||||
slots: { default: '<button data-test="first">OK</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const first = wrapper.find('[data-test="first"]').element
|
|
||||||
expect(document.activeElement).toBe(first)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('restores focus to the trigger when closed', async () => {
|
|
||||||
const trigger = document.createElement('button')
|
|
||||||
document.body.appendChild(trigger)
|
|
||||||
trigger.focus()
|
|
||||||
expect(document.activeElement).toBe(trigger)
|
|
||||||
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
slots: { default: '<button>OK</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
await wrapper.setProps({ modelValue: false })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(document.activeElement).toBe(trigger)
|
|
||||||
|
|
||||||
wrapper.unmount()
|
|
||||||
trigger.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wraps focus to the first element when Tab is pressed on the last element', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: true, showClose: false },
|
|
||||||
slots: { default: '<button data-test="btn1">First</button><button data-test="btn2">Last</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const last = wrapper.find('[data-test="btn2"]').element as HTMLElement
|
|
||||||
last.focus()
|
|
||||||
expect(document.activeElement).toBe(last)
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Tab' })
|
|
||||||
expect(document.activeElement).toBe(wrapper.find('[data-test="btn1"]').element)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wraps focus to the last element when Shift+Tab is pressed on the first element', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: true, showClose: false },
|
|
||||||
slots: { default: '<button data-test="btn1">First</button><button data-test="btn2">Last</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const first = wrapper.find('[data-test="btn1"]').element as HTMLElement
|
|
||||||
first.focus()
|
|
||||||
expect(document.activeElement).toBe(first)
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Tab', shiftKey: true })
|
|
||||||
expect(document.activeElement).toBe(wrapper.find('[data-test="btn2"]').element)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not release body scroll-lock when one stacked modal closes while another is still open', async () => {
|
|
||||||
const wrapperA = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
const wrapperB = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapperA.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperB.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperB.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperA.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,279 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Teleport to="body">
|
|
||||||
<Transition
|
|
||||||
name="modal"
|
|
||||||
appear
|
|
||||||
@after-leave="isRendered = false"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="isRendered && isOpen"
|
|
||||||
:id="componentId"
|
|
||||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
|
||||||
v-bind="attrs"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
:class="twMerge('absolute inset-0 bg-black/40', overlayClass)"
|
|
||||||
data-test="backdrop"
|
|
||||||
@click="onBackdropClick"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div
|
|
||||||
ref="panelRef"
|
|
||||||
:class="twMerge(
|
|
||||||
'relative z-50 flex max-h-[85vh] w-full max-w-md flex-col rounded-malio bg-white shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]',
|
|
||||||
modalClass,
|
|
||||||
)"
|
|
||||||
role="dialog"
|
|
||||||
aria-modal="true"
|
|
||||||
:aria-labelledby="hasHeader ? headerId : undefined"
|
|
||||||
:aria-label="hasHeader ? undefined : (ariaLabel || undefined)"
|
|
||||||
tabindex="-1"
|
|
||||||
data-test="panel"
|
|
||||||
@keydown="onKeydown"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="hasHeader || showClose"
|
|
||||||
:class="twMerge('flex shrink-0 items-center justify-between gap-4 px-5 py-[25px]', headerClass)"
|
|
||||||
data-test="header"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
:id="headerId"
|
|
||||||
class="min-w-0 flex-1"
|
|
||||||
data-test="header-content"
|
|
||||||
>
|
|
||||||
<slot name="header" />
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
v-if="showClose"
|
|
||||||
type="button"
|
|
||||||
aria-label="Fermer"
|
|
||||||
class="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full transition-colors hover:bg-m-surface"
|
|
||||||
data-test="close-button"
|
|
||||||
@click="close"
|
|
||||||
>
|
|
||||||
<IconifyIcon
|
|
||||||
icon="mdi:cancel-bold"
|
|
||||||
:width="16"
|
|
||||||
:height="16"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
:class="twMerge('flex-1 overflow-y-auto px-5', bodyClass)"
|
|
||||||
data-test="body"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="$slots.footer"
|
|
||||||
:class="twMerge('flex shrink-0 items-center gap-3 px-5 py-4', footerClass)"
|
|
||||||
data-test="footer"
|
|
||||||
>
|
|
||||||
<slot name="footer" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Transition>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {
|
|
||||||
computed,
|
|
||||||
nextTick,
|
|
||||||
onBeforeUnmount,
|
|
||||||
onMounted,
|
|
||||||
ref,
|
|
||||||
useAttrs,
|
|
||||||
useId,
|
|
||||||
useSlots,
|
|
||||||
watch,
|
|
||||||
} from 'vue'
|
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
|
||||||
import { twMerge } from 'tailwind-merge'
|
|
||||||
|
|
||||||
defineOptions({ name: 'MalioModal', inheritAttrs: false })
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
modelValue?: boolean
|
|
||||||
showClose?: boolean
|
|
||||||
dismissable?: boolean
|
|
||||||
closeOnEscape?: boolean
|
|
||||||
ariaLabel?: string
|
|
||||||
modalClass?: string
|
|
||||||
overlayClass?: string
|
|
||||||
headerClass?: string
|
|
||||||
bodyClass?: string
|
|
||||||
footerClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
id: '',
|
|
||||||
modelValue: undefined,
|
|
||||||
showClose: true,
|
|
||||||
dismissable: true,
|
|
||||||
closeOnEscape: true,
|
|
||||||
ariaLabel: '',
|
|
||||||
modalClass: '',
|
|
||||||
overlayClass: '',
|
|
||||||
headerClass: '',
|
|
||||||
bodyClass: '',
|
|
||||||
footerClass: '',
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(e: 'update:modelValue', value: boolean): void
|
|
||||||
(e: 'close'): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const attrs = useAttrs()
|
|
||||||
const generatedId = useId()
|
|
||||||
|
|
||||||
const componentId = computed(() => props.id || `malio-modal-${generatedId}`)
|
|
||||||
|
|
||||||
const slots = useSlots()
|
|
||||||
const headerId = computed(() => `${componentId.value}-header`)
|
|
||||||
const hasHeader = computed(() => !!slots.header)
|
|
||||||
|
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
|
||||||
const localValue = ref(false)
|
|
||||||
const isOpen = computed(() =>
|
|
||||||
isControlled.value ? props.modelValue! : localValue.value,
|
|
||||||
)
|
|
||||||
const isRendered = ref(isOpen.value)
|
|
||||||
|
|
||||||
const panelRef = ref<HTMLElement | null>(null)
|
|
||||||
|
|
||||||
let previouslyFocused: HTMLElement | null = null
|
|
||||||
// Per-instance flag: true while this modal holds a scroll-lock count slot.
|
|
||||||
let lockedByThisInstance = false
|
|
||||||
|
|
||||||
function getFocusable(container: HTMLElement): HTMLElement[] {
|
|
||||||
return Array.from(
|
|
||||||
container.querySelectorAll<HTMLElement>(
|
|
||||||
'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"]), [contenteditable]:not([contenteditable="false"])',
|
|
||||||
),
|
|
||||||
).filter((el) => el.tabIndex !== -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onOpen() {
|
|
||||||
previouslyFocused = (document.activeElement as HTMLElement | null) ?? null
|
|
||||||
if (!lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = true
|
|
||||||
openModalCount++
|
|
||||||
if (openModalCount === 1) {
|
|
||||||
document.body.style.overflow = 'hidden'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
nextTick(() => {
|
|
||||||
const panel = panelRef.value
|
|
||||||
if (!panel) return
|
|
||||||
const focusable = getFocusable(panel)
|
|
||||||
;(focusable[0] ?? panel).focus()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClose() {
|
|
||||||
if (lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = false
|
|
||||||
openModalCount = Math.max(0, openModalCount - 1)
|
|
||||||
if (openModalCount === 0) {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
previouslyFocused?.focus?.()
|
|
||||||
previouslyFocused = null
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(isOpen, (val) => {
|
|
||||||
if (val) {
|
|
||||||
isRendered.value = true
|
|
||||||
onOpen()
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
onClose()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
if (isOpen.value) onOpen()
|
|
||||||
})
|
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
|
||||||
// If this instance is still holding a scroll-lock slot, release it.
|
|
||||||
if (lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = false
|
|
||||||
openModalCount = Math.max(0, openModalCount - 1)
|
|
||||||
if (openModalCount === 0) {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
function onBackdropClick() {
|
|
||||||
if (props.dismissable) close()
|
|
||||||
}
|
|
||||||
|
|
||||||
function onKeydown(e: KeyboardEvent) {
|
|
||||||
if (e.key === 'Escape' && props.closeOnEscape) {
|
|
||||||
e.stopPropagation()
|
|
||||||
close()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (e.key !== 'Tab') return
|
|
||||||
|
|
||||||
const panel = panelRef.value
|
|
||||||
if (!panel) return
|
|
||||||
const focusable = getFocusable(panel)
|
|
||||||
if (focusable.length === 0) {
|
|
||||||
e.preventDefault()
|
|
||||||
panel.focus()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const first = focusable[0]!
|
|
||||||
const last = focusable[focusable.length - 1]!
|
|
||||||
if (e.shiftKey && document.activeElement === first) {
|
|
||||||
e.preventDefault()
|
|
||||||
last.focus()
|
|
||||||
}
|
|
||||||
else if (!e.shiftKey && document.activeElement === last) {
|
|
||||||
e.preventDefault()
|
|
||||||
first.focus()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function close() {
|
|
||||||
if (!isControlled.value) localValue.value = false
|
|
||||||
emit('update:modelValue', false)
|
|
||||||
emit('close')
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
// Shared across all MalioModal instances: only the last open modal releases the body scroll-lock.
|
|
||||||
let openModalCount = 0
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.modal-enter-active,
|
|
||||||
.modal-leave-active {
|
|
||||||
transition: opacity 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-active > div:last-child,
|
|
||||||
.modal-leave-active > div:last-child {
|
|
||||||
transition: transform 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-from,
|
|
||||||
.modal-leave-to {
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-from > div:last-child,
|
|
||||||
.modal-leave-to > div:last-child {
|
|
||||||
transform: scale(0.95);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -173,16 +173,6 @@ describe('MalioRadioButton', () => {
|
|||||||
expect(wrapper.get('input').classes()).toContain('checked:border-black')
|
expect(wrapper.get('input').classes()).toContain('checked:border-black')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountRadioButton({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountRadioButton({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('updates label color when toggled without v-model (uncontrolled)', async () => {
|
it('updates label color when toggled without v-model (uncontrolled)', async () => {
|
||||||
const wrapper = mountRadioButton({label: 'Option 1', value: 'a'})
|
const wrapper = mountRadioButton({label: 'Option 1', value: 'a'})
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
:for="inputId"
|
:for="inputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -46,7 +46,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, ref, useAttrs, useId} from 'vue'
|
import {computed, ref, useAttrs, useId} from 'vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioRadioButton', inheritAttrs: false})
|
defineOptions({name: 'MalioRadioButton', inheritAttrs: false})
|
||||||
|
|
||||||
|
|||||||
@@ -21,9 +21,6 @@ type SelectProps = {
|
|||||||
textLabel?: string
|
textLabel?: string
|
||||||
rounded?: string
|
rounded?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const SelectForTest = Select as DefineComponent<SelectProps>
|
const SelectForTest = Select as DefineComponent<SelectProps>
|
||||||
@@ -210,173 +207,4 @@ describe('MalioSelect', () => {
|
|||||||
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
|
expect(wrapper.find('p.text-m-success').exists()).toBe(false)
|
||||||
expect(wrapper.get('p.text-m-danger').text()).toBe('Selection error')
|
expect(wrapper.get('p.text-m-danger').text()).toBe('Selection error')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('shows muted chevron color when empty and closed', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows primary chevron color when open', async () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows black chevron color when an option is selected and closed', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: 'fr', options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows muted chevron color when disabled', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: 'fr', options, disabled: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows danger chevron color on error even when open', async () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options, error: 'Selection error'},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-danger')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows success chevron color on success', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options, success: 'OK'},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-success')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ', required: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ'},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('expose aria-required quand required est vrai', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options, required: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'expose pas aria-required par défaut', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps the bottom border allocation when open downward (transparent, not zero)', async () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, options},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
const buttonClasses = wrapper.get('button').classes()
|
|
||||||
// !border-b-0 would shrink the bottom border to 0px and grow content area by 1px;
|
|
||||||
// !border-b-transparent keeps the 1px allocation but hides the line
|
|
||||||
expect(buttonClasses).not.toContain('!border-b-0')
|
|
||||||
expect(buttonClasses).toContain('!border-b-transparent')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même sans sélection, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ', readonly: true, options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.classes()).toContain('border-black')
|
|
||||||
expect(trigger.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(trigger.classes()).not.toContain('grow-height')
|
|
||||||
expect(trigger.classes()).not.toContain('focus-visible:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ', readonly: true, options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).not.toContain('text-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly sélectionné : label noir + chevron noir', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: 'a', options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly empêche l’ouverture du dropdown', async () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ', readonly: true, options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
expect(wrapper.find('[role="listbox"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly expose aria-readonly et reste focusable (pas disabled)', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {
|
|
||||||
props: {modelValue: null, label: 'Champ', readonly: true, options},
|
|
||||||
})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.attributes('aria-readonly')).toBe('true')
|
|
||||||
expect(trigger.attributes('disabled')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disabled + readonly : pas d’aria-readonly (disabled prime)', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {props: {modelValue: null, label: 'Champ', disabled: true, readonly: true, options: [{label: 'A', value: 'a'}]}})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.attributes('aria-readonly')).toBeUndefined()
|
|
||||||
expect(trigger.attributes('disabled')).toBeDefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {props: {modelValue: null, label: 'Champ', options}})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {props: {modelValue: null, label: 'Champ', options, reserveMessageSpace: false}})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mount(SelectForTest, {props: {modelValue: null, label: 'Champ', options, reserveMessageSpace: false, error: 'Erreur'}})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,32 +8,28 @@
|
|||||||
:id="buttonId"
|
:id="buttonId"
|
||||||
ref="buttonRef"
|
ref="buttonRef"
|
||||||
type="button"
|
type="button"
|
||||||
class="peer relative w-full border bg-white pl-3 pr-10 py-1 text-left outline-none"
|
class="grow-height peer relative w-full border bg-white pl-3 pr-10 py-1 text-left outline-none focus-visible:border-m-primary"
|
||||||
:class="[
|
:class="[
|
||||||
isReadonly ? '' : 'grow-height',
|
|
||||||
isReadonly ? '' : 'focus-visible:border-m-primary',
|
|
||||||
hasError
|
hasError
|
||||||
? isOpen
|
? isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-danger !border-b-transparent'
|
? 'rounded-b-none !border !border-m-danger !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-danger !border-t-transparent'
|
: 'rounded-t-none !border !border-m-danger !border-t-0'
|
||||||
: 'border-m-danger'
|
: 'border-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? isOpen
|
? isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-success !border-b-transparent'
|
? 'rounded-b-none !border !border-m-success !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-success !border-t-transparent'
|
: 'rounded-t-none !border !border-m-success !border-t-0'
|
||||||
: 'border-m-success'
|
: 'border-m-success'
|
||||||
: isReadonly
|
|
||||||
? 'border-black'
|
|
||||||
: isOpen
|
: isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-primary !border-b-transparent'
|
? 'rounded-b-none !border !border-m-primary !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-primary !border-t-transparent'
|
: 'rounded-t-none !border !border-m-primary !border-t-0'
|
||||||
: isOptionSelected
|
: isOptionSelected
|
||||||
? 'border-black'
|
? 'border-black'
|
||||||
: 'border-m-muted',
|
: 'border-m-muted',
|
||||||
disabled ? 'cursor-not-allowed border-m-muted text-black/60' : isReadonly ? 'cursor-default' : 'cursor-pointer',
|
disabled ? 'cursor-not-allowed border-m-muted text-black/60' : 'cursor-pointer',
|
||||||
label ? 'min-h-[40px]' : 'h-[40px] py-0',
|
label ? 'min-h-[40px]' : 'h-[40px] py-0',
|
||||||
rounded,
|
rounded,
|
||||||
textField,
|
textField,
|
||||||
@@ -42,8 +38,6 @@
|
|||||||
:aria-controls="listboxId"
|
:aria-controls="listboxId"
|
||||||
:aria-invalid="hasError"
|
:aria-invalid="hasError"
|
||||||
:aria-describedby="describedBy"
|
:aria-describedby="describedBy"
|
||||||
:aria-required="required || undefined"
|
|
||||||
:aria-readonly="isReadonly || undefined"
|
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@click="toggle"
|
@click="toggle"
|
||||||
>
|
>
|
||||||
@@ -56,10 +50,6 @@
|
|||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: isReadonly
|
|
||||||
? isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
: isOpen
|
: isOpen
|
||||||
? 'text-m-primary'
|
? 'text-m-primary'
|
||||||
: isOptionSelected
|
: isOptionSelected
|
||||||
@@ -69,7 +59,7 @@
|
|||||||
]"
|
]"
|
||||||
:style="labelTransformStyle"
|
:style="labelTransformStyle"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
@@ -83,24 +73,13 @@
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
data-test="chevron"
|
|
||||||
class="absolute right-3 top-1/2 -translate-y-1/2"
|
class="absolute right-3 top-1/2 -translate-y-1/2"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled
|
: 'text-current'
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly
|
|
||||||
? isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
: isOpen
|
|
||||||
? 'text-m-primary'
|
|
||||||
: isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
<slot name="icon">
|
<slot name="icon">
|
||||||
@@ -166,7 +145,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${buttonId}-describedby`"
|
:id="`${buttonId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -175,7 +154,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 ml-[2px] text-xs',
|
'mt-1 ml-[2px] text-xs',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
@@ -187,7 +165,6 @@
|
|||||||
import {computed, onBeforeUnmount, onMounted, ref, useId, nextTick} from 'vue'
|
import {computed, onBeforeUnmount, onMounted, ref, useId, nextTick} from 'vue'
|
||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
import {Icon as IconifyIcon} from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioSelect', inheritAttrs: false})
|
defineOptions({name: 'MalioSelect', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -208,11 +185,8 @@ const props = withDefaults(defineProps<{
|
|||||||
textLabel?: string
|
textLabel?: string
|
||||||
rounded?: string
|
rounded?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
noOptionsText?: string
|
noOptionsText?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(), {
|
}>(), {
|
||||||
options: () => [],
|
options: () => [],
|
||||||
emptyOptionLabel: '',
|
emptyOptionLabel: '',
|
||||||
@@ -225,11 +199,8 @@ const props = withDefaults(defineProps<{
|
|||||||
textLabel: 'text-sm',
|
textLabel: 'text-sm',
|
||||||
rounded: 'rounded-md',
|
rounded: 'rounded-md',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
readonly: false,
|
|
||||||
groupClass: '',
|
groupClass: '',
|
||||||
noOptionsText: 'Aucune option disponible',
|
noOptionsText: 'Aucune option disponible',
|
||||||
required: false,
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -257,9 +228,8 @@ const hasSuccess = computed(() => !!props.success && !hasError.value)
|
|||||||
const isOptionSelected = computed(() =>
|
const isOptionSelected = computed(() =>
|
||||||
props.options.some(o => o.value === props.modelValue)
|
props.options.some(o => o.value === props.modelValue)
|
||||||
)
|
)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const shouldFloatLabel = computed(() =>
|
const shouldFloatLabel = computed(() =>
|
||||||
isReadonly.value ? isOptionSelected.value : (isOpen.value || isOptionSelected.value)
|
isOpen.value || isOptionSelected.value
|
||||||
)
|
)
|
||||||
const selectedLabel = computed(() =>
|
const selectedLabel = computed(() =>
|
||||||
props.options.find(o => o.value === props.modelValue)?.label ?? ''
|
props.options.find(o => o.value === props.modelValue)?.label ?? ''
|
||||||
@@ -287,7 +257,6 @@ function updateOpenDirection() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function open() {
|
function open() {
|
||||||
if (props.disabled || props.readonly) return
|
|
||||||
updateOpenDirection()
|
updateOpenDirection()
|
||||||
isOpen.value = true
|
isOpen.value = true
|
||||||
|
|
||||||
@@ -331,7 +300,7 @@ function close() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function toggle() {
|
function toggle() {
|
||||||
if (props.disabled || props.readonly) return
|
if (props.disabled) return
|
||||||
if (isOpen.value) {
|
if (isOpen.value) {
|
||||||
close()
|
close()
|
||||||
return
|
return
|
||||||
@@ -361,7 +330,12 @@ onBeforeUnmount(() => document.removeEventListener('mousedown', onClickOutside))
|
|||||||
}
|
}
|
||||||
|
|
||||||
.grow-height {
|
.grow-height {
|
||||||
transition: border-color 160ms ease, box-shadow 160ms ease;
|
transition: border-color 160ms ease, box-shadow 160ms ease, padding-top 160ms ease, padding-bottom 160ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grow-height:focus {
|
||||||
|
padding-top: 0.625rem;
|
||||||
|
padding-bottom: 0.625rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
import {describe, expect, it} from 'vitest'
|
||||||
import {mount, renderToString} from '@vue/test-utils'
|
import {mount} from '@vue/test-utils'
|
||||||
import type {DefineComponent} from 'vue'
|
import type {DefineComponent} from 'vue'
|
||||||
import SelectCheckbox from './SelectCheckbox.vue'
|
import SelectCheckbox from './SelectCheckbox.vue'
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@ type Option = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SelectCheckboxProps = {
|
type SelectCheckboxProps = {
|
||||||
modelValue?: Array<string | number>
|
modelValue: Array<string | number>
|
||||||
options?: Option[]
|
options?: Option[]
|
||||||
emptyOptionLabel?: string
|
emptyOptionLabel?: string
|
||||||
label?: string
|
label?: string
|
||||||
@@ -24,10 +24,7 @@ type SelectCheckboxProps = {
|
|||||||
displaySelectAll?: boolean
|
displaySelectAll?: boolean
|
||||||
selectAllLabel?: string
|
selectAllLabel?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const SelectCheckboxForTest = SelectCheckbox as DefineComponent<SelectCheckboxProps>
|
const SelectCheckboxForTest = SelectCheckbox as DefineComponent<SelectCheckboxProps>
|
||||||
@@ -39,18 +36,6 @@ const options: Option[] = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
describe('MalioSelectCheckbox', () => {
|
describe('MalioSelectCheckbox', () => {
|
||||||
it('rend sans planter quand modelValue n’est pas fourni (non contrôlé)', () => {
|
|
||||||
expect(() =>
|
|
||||||
mount(SelectCheckboxForTest, {props: {label: 'Catégories', options}}),
|
|
||||||
).not.toThrow()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('rend en SSR sans planter quand modelValue est absent (cause du crash playground)', async () => {
|
|
||||||
await expect(
|
|
||||||
renderToString(SelectCheckboxForTest, {props: {label: 'Catégories', readonly: true, options}}),
|
|
||||||
).resolves.toBeTruthy()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders checkbox inputs for options', async () => {
|
it('renders checkbox inputs for options', async () => {
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
const wrapper = mount(SelectCheckboxForTest, {
|
||||||
props: {modelValue: [], options},
|
props: {modelValue: [], options},
|
||||||
@@ -197,173 +182,4 @@ describe('MalioSelectCheckbox', () => {
|
|||||||
const root = wrapper.find('button').element.parentElement
|
const root = wrapper.find('button').element.parentElement
|
||||||
expect(root?.className).toContain('mt-4')
|
expect(root?.className).toContain('mt-4')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('shows muted chevron color when nothing is selected and closed', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows primary chevron color when open', async () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows black chevron color when options are selected and closed', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: ['fr'], options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows muted chevron color when disabled', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: ['fr'], options, disabled: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows danger chevron color on error even when open', async () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options, error: 'Selection error'},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-danger')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows success chevron color on success', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options, success: 'OK'},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-m-success')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], label: 'Champ', required: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], label: 'Champ'},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('expose aria-required quand required est vrai', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options, required: true},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'expose pas aria-required par défaut', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options},
|
|
||||||
})
|
|
||||||
|
|
||||||
expect(wrapper.find('[aria-required="true"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps the bottom border allocation when open downward (transparent, not zero)', async () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {modelValue: [], options},
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
|
|
||||||
const buttonClasses = wrapper.get('button').classes()
|
|
||||||
// !border-b-0 would shrink the bottom border to 0px and grow content area by 1px;
|
|
||||||
// !border-b-transparent keeps the 1px allocation but hides the line
|
|
||||||
expect(buttonClasses).not.toContain('!border-b-0')
|
|
||||||
expect(buttonClasses).toContain('!border-b-transparent')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : bordure noire même sans sélection, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: [], options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.classes()).toContain('border-black')
|
|
||||||
expect(trigger.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(trigger.classes()).not.toContain('grow-height')
|
|
||||||
expect(trigger.classes()).not.toContain('focus-visible:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label gris, pas de bleu', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: [], options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).not.toContain('text-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly sélectionné : label noir + chevron noir', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: ['a'], options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
expect(wrapper.get('[data-test="chevron"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly empêche l’ouverture du dropdown', async () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: [], options: [{label: 'A', value: 'a'}]},
|
|
||||||
})
|
|
||||||
await wrapper.get('button').trigger('click')
|
|
||||||
expect(wrapper.find('[role="listbox"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly expose aria-readonly et reste focusable (pas disabled)', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {
|
|
||||||
props: {label: 'Champ', readonly: true, modelValue: [], options},
|
|
||||||
})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.attributes('aria-readonly')).toBe('true')
|
|
||||||
expect(trigger.attributes('disabled')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disabled + readonly : pas d’aria-readonly (disabled prime)', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {props: {modelValue: [], label: 'Champ', disabled: true, readonly: true, options: [{label: 'A', value: 'a'}]}})
|
|
||||||
const trigger = wrapper.get('button')
|
|
||||||
expect(trigger.attributes('aria-readonly')).toBeUndefined()
|
|
||||||
expect(trigger.attributes('disabled')).toBeDefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {props: {label: 'Champ', options}})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {props: {label: 'Champ', options, reserveMessageSpace: false}})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mount(SelectCheckboxForTest, {props: {label: 'Champ', options, reserveMessageSpace: false, error: 'Erreur'}})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,32 +8,28 @@
|
|||||||
:id="buttonId"
|
:id="buttonId"
|
||||||
ref="buttonRef"
|
ref="buttonRef"
|
||||||
type="button"
|
type="button"
|
||||||
class="peer relative w-full border bg-white pl-3 pr-10 py-1 text-left outline-none"
|
class="grow-height peer relative w-full border bg-white pl-3 pr-10 py-1 text-left outline-none focus-visible:border-m-primary"
|
||||||
:class="[
|
:class="[
|
||||||
isReadonly ? '' : 'grow-height',
|
|
||||||
isReadonly ? '' : 'focus-visible:border-m-primary',
|
|
||||||
hasError
|
hasError
|
||||||
? isOpen
|
? isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-danger !border-b-transparent'
|
? 'rounded-b-none !border !border-m-danger !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-danger !border-t-transparent'
|
: 'rounded-t-none !border !border-m-danger !border-t-0'
|
||||||
: 'border-m-danger'
|
: 'border-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? isOpen
|
? isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-success !border-b-transparent'
|
? 'rounded-b-none !border !border-m-success !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-success !border-t-transparent'
|
: 'rounded-t-none !border !border-m-success !border-t-0'
|
||||||
: 'border-m-success'
|
: 'border-m-success'
|
||||||
: isReadonly
|
|
||||||
? 'border-black'
|
|
||||||
: isOpen
|
: isOpen
|
||||||
? openDirection === 'down'
|
? openDirection === 'down'
|
||||||
? 'rounded-b-none !border !border-m-primary !border-b-transparent'
|
? 'rounded-b-none !border !border-m-primary !border-b-0'
|
||||||
: 'rounded-t-none !border !border-m-primary !border-t-transparent'
|
: 'rounded-t-none !border !border-m-primary !border-t-0'
|
||||||
: isOptionSelected
|
: isOptionSelected
|
||||||
? 'border-black'
|
? 'border-black'
|
||||||
: 'border-m-muted',
|
: 'border-m-muted',
|
||||||
disabled ? 'cursor-not-allowed border-m-muted text-black/60' : isReadonly ? 'cursor-default' : 'cursor-pointer',
|
disabled ? 'cursor-not-allowed border-m-muted text-black/60' : 'cursor-pointer',
|
||||||
label ? 'min-h-[40px]' : 'h-[40px] py-0',
|
label ? 'min-h-[40px]' : 'h-[40px] py-0',
|
||||||
rounded,
|
rounded,
|
||||||
textField,
|
textField,
|
||||||
@@ -42,8 +38,6 @@
|
|||||||
:aria-controls="listboxId"
|
:aria-controls="listboxId"
|
||||||
:aria-invalid="hasError"
|
:aria-invalid="hasError"
|
||||||
:aria-describedby="describedBy"
|
:aria-describedby="describedBy"
|
||||||
:aria-required="required || undefined"
|
|
||||||
:aria-readonly="isReadonly || undefined"
|
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
@click="toggle"
|
@click="toggle"
|
||||||
>
|
>
|
||||||
@@ -56,10 +50,6 @@
|
|||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: isReadonly
|
|
||||||
? isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
: isOpen
|
: isOpen
|
||||||
? 'text-m-primary'
|
? 'text-m-primary'
|
||||||
: isOptionSelected
|
: isOptionSelected
|
||||||
@@ -69,7 +59,7 @@
|
|||||||
]"
|
]"
|
||||||
:style="labelTransformStyle"
|
:style="labelTransformStyle"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -111,24 +101,13 @@
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
data-test="chevron"
|
|
||||||
class="absolute right-3 top-1/2 -translate-y-1/2"
|
class="absolute right-3 top-1/2 -translate-y-1/2"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
? 'text-m-danger'
|
? 'text-m-danger'
|
||||||
: hasSuccess
|
: hasSuccess
|
||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: disabled
|
: 'text-current'
|
||||||
? 'text-m-muted'
|
|
||||||
: isReadonly
|
|
||||||
? isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
: isOpen
|
|
||||||
? 'text-m-primary'
|
|
||||||
: isOptionSelected
|
|
||||||
? 'text-black'
|
|
||||||
: 'text-m-muted'
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
<slot name="icon">
|
<slot name="icon">
|
||||||
@@ -184,7 +163,6 @@
|
|||||||
group-class="!mt-0"
|
group-class="!mt-0"
|
||||||
label-class="option-checkbox w-full cursor-pointer font-semibold"
|
label-class="option-checkbox w-full cursor-pointer font-semibold"
|
||||||
tabindex="-1"
|
tabindex="-1"
|
||||||
:reserve-message-space="false"
|
|
||||||
@update:model-value="toggleAll"
|
@update:model-value="toggleAll"
|
||||||
/>
|
/>
|
||||||
</li>
|
</li>
|
||||||
@@ -210,14 +188,13 @@
|
|||||||
group-class="!mt-0"
|
group-class="!mt-0"
|
||||||
label-class="option-checkbox w-full cursor-pointer"
|
label-class="option-checkbox w-full cursor-pointer"
|
||||||
tabindex="-1"
|
tabindex="-1"
|
||||||
:reserve-message-space="false"
|
|
||||||
@update:model-value="toggleOption(opt.value)"
|
@update:model-value="toggleOption(opt.value)"
|
||||||
/>
|
/>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${buttonId}-describedby`"
|
:id="`${buttonId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -226,7 +203,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 ml-[2px] text-xs',
|
'mt-1 ml-[2px] text-xs',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
@@ -239,7 +215,6 @@ import {computed, onBeforeUnmount, onMounted, ref, useId, nextTick} from 'vue'
|
|||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
import {Icon as IconifyIcon} from '@iconify/vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import Checkbox from '../checkbox/Checkbox.vue'
|
import Checkbox from '../checkbox/Checkbox.vue'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioSelectCheckbox', inheritAttrs: false})
|
defineOptions({name: 'MalioSelectCheckbox', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -248,7 +223,7 @@ type Option = {
|
|||||||
value: string | number
|
value: string | number
|
||||||
}
|
}
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
modelValue?: Array<string | number>
|
modelValue: Array<string | number>
|
||||||
options?: Option[]
|
options?: Option[]
|
||||||
emptyOptionLabel?: string
|
emptyOptionLabel?: string
|
||||||
label?: string
|
label?: string
|
||||||
@@ -263,13 +238,9 @@ const props = withDefaults(defineProps<{
|
|||||||
displaySelectAll?: boolean
|
displaySelectAll?: boolean
|
||||||
selectAllLabel?: string
|
selectAllLabel?: string
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
readonly?: boolean
|
|
||||||
groupClass?: string
|
groupClass?: string
|
||||||
noOptionsText?: string
|
noOptionsText?: string
|
||||||
required?: boolean
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(), {
|
}>(), {
|
||||||
modelValue: () => [],
|
|
||||||
options: () => [],
|
options: () => [],
|
||||||
emptyOptionLabel: '',
|
emptyOptionLabel: '',
|
||||||
label: '',
|
label: '',
|
||||||
@@ -284,11 +255,8 @@ const props = withDefaults(defineProps<{
|
|||||||
displaySelectAll: false,
|
displaySelectAll: false,
|
||||||
selectAllLabel: 'Tout sélectionner',
|
selectAllLabel: 'Tout sélectionner',
|
||||||
disabled: false,
|
disabled: false,
|
||||||
readonly: false,
|
|
||||||
groupClass: '',
|
groupClass: '',
|
||||||
noOptionsText: 'Aucune option disponible',
|
noOptionsText: 'Aucune option disponible',
|
||||||
required: false,
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -313,7 +281,6 @@ const hasSuccess = computed(() => !!props.success && !hasError.value)
|
|||||||
const isOptionSelected = computed(() =>
|
const isOptionSelected = computed(() =>
|
||||||
props.modelValue.length > 0
|
props.modelValue.length > 0
|
||||||
)
|
)
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const selectedOptions = computed(() =>
|
const selectedOptions = computed(() =>
|
||||||
normalizedOptions.value.filter(option => props.modelValue.includes(option.value)),
|
normalizedOptions.value.filter(option => props.modelValue.includes(option.value)),
|
||||||
)
|
)
|
||||||
@@ -321,7 +288,7 @@ const displayTags = computed(() =>
|
|||||||
props.displayTag && selectedOptions.value.length > 0,
|
props.displayTag && selectedOptions.value.length > 0,
|
||||||
)
|
)
|
||||||
const shouldFloatLabel = computed(() =>
|
const shouldFloatLabel = computed(() =>
|
||||||
isReadonly.value ? isOptionSelected.value : (isOpen.value || displayTags.value)
|
isOpen.value || displayTags.value
|
||||||
)
|
)
|
||||||
const selectionSummary = computed(() =>
|
const selectionSummary = computed(() =>
|
||||||
`${props.modelValue.length}/${normalizedOptions.value.length}`
|
`${props.modelValue.length}/${normalizedOptions.value.length}`
|
||||||
@@ -353,7 +320,6 @@ function updateOpenDirection() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function open() {
|
function open() {
|
||||||
if (props.disabled || props.readonly) return
|
|
||||||
updateOpenDirection()
|
updateOpenDirection()
|
||||||
isOpen.value = true
|
isOpen.value = true
|
||||||
|
|
||||||
@@ -397,7 +363,7 @@ function close() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function toggle() {
|
function toggle() {
|
||||||
if (props.disabled || props.readonly) return
|
if (props.disabled) return
|
||||||
if (isOpen.value) {
|
if (isOpen.value) {
|
||||||
close()
|
close()
|
||||||
return
|
return
|
||||||
@@ -443,7 +409,12 @@ onBeforeUnmount(() => document.removeEventListener('mousedown', onClickOutside))
|
|||||||
}
|
}
|
||||||
|
|
||||||
.grow-height {
|
.grow-height {
|
||||||
transition: border-color 160ms ease, box-shadow 160ms ease;
|
transition: border-color 160ms ease, box-shadow 160ms ease, padding-top 160ms ease, padding-bottom 160ms ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grow-height:focus {
|
||||||
|
padding-top: 0.625rem;
|
||||||
|
padding-bottom: 0.625rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import RequiredMark from './RequiredMark.vue'
|
|
||||||
|
|
||||||
describe('MalioRequiredMark', () => {
|
|
||||||
it('rend un astérisque', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.text()).toBe('*')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('est masqué pour les technologies d\'assistance', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.get('[data-test="required-mark"]').attributes('aria-hidden')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('utilise le token de couleur danger', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.get('[data-test="required-mark"]').classes()).toContain('text-m-danger')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('rend l\'astérisque à 16px', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.get('[data-test="required-mark"]').classes()).toContain('text-[16px]')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<template>
|
|
||||||
<span
|
|
||||||
data-test="required-mark"
|
|
||||||
aria-hidden="true"
|
|
||||||
class="ml-0.5 select-none text-[16px] leading-none text-m-danger"
|
|
||||||
>*</span>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
defineOptions({name: 'MalioRequiredMark', inheritAttrs: false})
|
|
||||||
</script>
|
|
||||||
@@ -15,8 +15,6 @@ type TabListProps = {
|
|||||||
tabs: Tab[]
|
tabs: Tab[]
|
||||||
modelValue?: string
|
modelValue?: string
|
||||||
id?: string
|
id?: string
|
||||||
maxVisibleTabs?: number
|
|
||||||
maxWidth?: number
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const TabListForTest = TabList as DefineComponent<TabListProps>
|
const TabListForTest = TabList as DefineComponent<TabListProps>
|
||||||
@@ -187,154 +185,3 @@ describe('MalioTabList', () => {
|
|||||||
expect(buttons[1].attributes('aria-selected')).toBe('false')
|
expect(buttons[1].attributes('aria-selected')).toBe('false')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('MalioTabList — fenêtrage maxVisibleTabs', () => {
|
|
||||||
const sevenTabs: Tab[] = [
|
|
||||||
{key: 't1', label: 'Tab 1'},
|
|
||||||
{key: 't2', label: 'Tab 2'},
|
|
||||||
{key: 't3', label: 'Tab 3'},
|
|
||||||
{key: 't4', label: 'Tab 4'},
|
|
||||||
{key: 't5', label: 'Tab 5'},
|
|
||||||
{key: 't6', label: 'Tab 6'},
|
|
||||||
{key: 't7', label: 'Tab 7'},
|
|
||||||
]
|
|
||||||
|
|
||||||
it('applies the default maxWidth (1100px) on the tabs container when windowed', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
expect(wrapper.find('[role="tablist"]').attributes('style')).toContain('max-width: 1100px')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies a custom maxWidth on the tabs container', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5, maxWidth: 1200})
|
|
||||||
expect(wrapper.find('[role="tablist"]').attributes('style')).toContain('max-width: 1200px')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders only maxVisibleTabs buttons and disables prev at start', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
const buttons = wrapper.findAll('[role="tab"]')
|
|
||||||
expect(buttons).toHaveLength(5)
|
|
||||||
expect(buttons[0].text()).toContain('Tab 1')
|
|
||||||
expect(buttons[4].text()).toContain('Tab 5')
|
|
||||||
|
|
||||||
const prev = wrapper.find('[data-test="tab-prev"]')
|
|
||||||
const next = wrapper.find('[data-test="tab-next"]')
|
|
||||||
expect(prev.exists()).toBe(true)
|
|
||||||
expect(next.exists()).toBe(true)
|
|
||||||
expect(prev.attributes('disabled')).toBeDefined()
|
|
||||||
expect(next.attributes('disabled')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shifts the window by 1 on next click', async () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
|
|
||||||
const labels = wrapper.findAll('[role="tab"]').map(b => b.text())
|
|
||||||
expect(labels.some(l => l.includes('Tab 1'))).toBe(false)
|
|
||||||
expect(labels.some(l => l.includes('Tab 6'))).toBe(true)
|
|
||||||
expect(labels).toHaveLength(5)
|
|
||||||
|
|
||||||
expect(wrapper.find('[data-test="tab-prev"]').attributes('disabled')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('disables next at the end and shows the last window', async () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
|
|
||||||
// 7 - 5 = 2 clicks to reach the end
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
|
|
||||||
const next = wrapper.find('[data-test="tab-next"]')
|
|
||||||
expect(next.attributes('disabled')).toBeDefined()
|
|
||||||
|
|
||||||
const buttons = wrapper.findAll('[role="tab"]')
|
|
||||||
expect(buttons).toHaveLength(5)
|
|
||||||
// last window starts at tabs[length-5] = tabs[2] = Tab 3
|
|
||||||
expect(buttons[0].text()).toContain('Tab 3')
|
|
||||||
expect(buttons[4].text()).toContain('Tab 7')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('clicking next past the end does not overshoot', async () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
const next = wrapper.find('[data-test="tab-next"]')
|
|
||||||
|
|
||||||
await next.trigger('click')
|
|
||||||
await next.trigger('click')
|
|
||||||
await next.trigger('click') // guarded, no-op
|
|
||||||
await next.trigger('click') // guarded, no-op
|
|
||||||
|
|
||||||
const buttons = wrapper.findAll('[role="tab"]')
|
|
||||||
expect(buttons).toHaveLength(5)
|
|
||||||
expect(buttons[0].text()).toContain('Tab 3')
|
|
||||||
expect(buttons[4].text()).toContain('Tab 7')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders no arrows and all tabs when maxVisibleTabs is undefined', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs})
|
|
||||||
expect(wrapper.findAll('[role="tab"]')).toHaveLength(7)
|
|
||||||
expect(wrapper.find('[data-test="tab-prev"]').exists()).toBe(false)
|
|
||||||
expect(wrapper.find('[data-test="tab-next"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders no arrows when maxVisibleTabs >= tabs.length', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 7})
|
|
||||||
expect(wrapper.findAll('[role="tab"]')).toHaveLength(7)
|
|
||||||
expect(wrapper.find('[data-test="tab-prev"]').exists()).toBe(false)
|
|
||||||
expect(wrapper.find('[data-test="tab-next"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('selecting a visible tab activates it without moving the window', async () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
const buttons = wrapper.findAll('[role="tab"]')
|
|
||||||
|
|
||||||
await buttons[2].trigger('click')
|
|
||||||
|
|
||||||
const after = wrapper.findAll('[role="tab"]')
|
|
||||||
expect(after[2].attributes('aria-selected')).toBe('true')
|
|
||||||
// window unchanged
|
|
||||||
expect(after[0].text()).toContain('Tab 1')
|
|
||||||
expect(after).toHaveLength(5)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps the active panel rendered even when its tab is outside the window', async () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{tabs: sevenTabs, maxVisibleTabs: 5, modelValue: 't1'},
|
|
||||||
{t1: '<p>Panel 1</p>'},
|
|
||||||
)
|
|
||||||
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
|
|
||||||
// Tab 1 is no longer in the window
|
|
||||||
const labels = wrapper.findAll('[role="tab"]').map(b => b.text())
|
|
||||||
expect(labels.some(l => l.includes('Tab 1'))).toBe(false)
|
|
||||||
|
|
||||||
// but its panel is still rendered and visible
|
|
||||||
const panels = wrapper.findAll('[role="tabpanel"]')
|
|
||||||
expect(panels).toHaveLength(7)
|
|
||||||
expect(wrapper.text()).toContain('Panel 1')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('keeps exactly one rendered tab with tabindex=0 when the active tab scrolls out of the window', async () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
|
|
||||||
// active tab is the first one (t1) by default; scroll it out of the window
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
await wrapper.find('[data-test="tab-next"]').trigger('click')
|
|
||||||
|
|
||||||
// t1 is no longer rendered
|
|
||||||
const labels = wrapper.findAll('[role="tab"]').map(b => b.text())
|
|
||||||
expect(labels.some(l => l.includes('Tab 1'))).toBe(false)
|
|
||||||
|
|
||||||
const focusable = wrapper.findAll('[role="tab"]').filter(b => b.attributes('tabindex') === '0')
|
|
||||||
expect(focusable).toHaveLength(1)
|
|
||||||
// falls back to the first visible tab (Tab 3)
|
|
||||||
expect(focusable[0].text()).toContain('Tab 3')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('arrows expose aria-labels', () => {
|
|
||||||
const wrapper = mountComponent({tabs: sevenTabs, maxVisibleTabs: 5})
|
|
||||||
expect(wrapper.find('[data-test="tab-prev"]').attributes('aria-label')).toBe('Onglets précédents')
|
|
||||||
expect(wrapper.find('[data-test="tab-next"]').attributes('aria-label')).toBe('Onglets suivants')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -1,81 +1,11 @@
|
|||||||
<template>
|
<template>
|
||||||
<div v-bind="$attrs">
|
<div v-bind="$attrs">
|
||||||
<div v-if="isWindowed" class="flex items-center justify-center gap-[36px] border-b border-m-primary">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
aria-label="Onglets précédents"
|
|
||||||
data-test="tab-prev"
|
|
||||||
:disabled="!canPrev"
|
|
||||||
:class="[
|
|
||||||
'transition-colors',
|
|
||||||
canPrev
|
|
||||||
? 'cursor-pointer text-m-btn-primary hover:text-m-btn-primary-hover active:text-m-btn-primary-active'
|
|
||||||
: 'cursor-not-allowed text-m-disabled',
|
|
||||||
]"
|
|
||||||
@click="prev"
|
|
||||||
>
|
|
||||||
<IconifyIcon icon="mdi:chevron-left" :width="28" />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
role="tablist"
|
|
||||||
class="flex flex-1 justify-center gap-[60px]"
|
|
||||||
:style="{ maxWidth: `${maxWidth}px` }"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
v-for="tab in visibleTabs"
|
|
||||||
:id="`${componentId}-tab-${tab.key}`"
|
|
||||||
:key="tab.key"
|
|
||||||
role="tab"
|
|
||||||
type="button"
|
|
||||||
:aria-selected="activeTab === tab.key"
|
|
||||||
:aria-controls="`${componentId}-panel-${tab.key}`"
|
|
||||||
:aria-disabled="!!tab.disabled"
|
|
||||||
:tabindex="focusedKey === tab.key ? 0 : -1"
|
|
||||||
:disabled="tab.disabled"
|
|
||||||
:class="[
|
|
||||||
'relative flex items-center gap-[18px] text-[24px] font-[600] transition-colors',
|
|
||||||
activeTab === tab.key
|
|
||||||
? 'cursor-pointer text-m-primary after:content-[\'\'] after:absolute after:-bottom-[3px] after:left-0 after:right-0 after:h-[3px] after:bg-m-primary'
|
|
||||||
: tab.disabled
|
|
||||||
? 'cursor-not-allowed text-m-primary/50'
|
|
||||||
: 'cursor-pointer text-m-primary/50 hover:text-m-primary/70',
|
|
||||||
]"
|
|
||||||
@click="selectTab(tab.key)"
|
|
||||||
>
|
|
||||||
<IconifyIcon
|
|
||||||
v-if="tab.icon"
|
|
||||||
:icon="tab.icon"
|
|
||||||
:width="tab.iconSize ?? 24"
|
|
||||||
/>
|
|
||||||
{{ tab.label }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
aria-label="Onglets suivants"
|
|
||||||
data-test="tab-next"
|
|
||||||
:disabled="!canNext"
|
|
||||||
:class="[
|
|
||||||
'transition-colors',
|
|
||||||
canNext
|
|
||||||
? 'cursor-pointer text-m-btn-primary hover:text-m-btn-primary-hover active:text-m-btn-primary-active'
|
|
||||||
: 'cursor-not-allowed text-m-disabled',
|
|
||||||
]"
|
|
||||||
@click="next"
|
|
||||||
>
|
|
||||||
<IconifyIcon icon="mdi:chevron-right" :width="28" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-else
|
|
||||||
role="tablist"
|
role="tablist"
|
||||||
class="flex justify-center gap-[60px] border-b border-m-primary"
|
class="flex justify-center gap-[60px] border-b border-m-primary"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
v-for="tab in visibleTabs"
|
v-for="tab in tabs"
|
||||||
:id="`${componentId}-tab-${tab.key}`"
|
:id="`${componentId}-tab-${tab.key}`"
|
||||||
:key="tab.key"
|
:key="tab.key"
|
||||||
role="tab"
|
role="tab"
|
||||||
@@ -83,7 +13,7 @@
|
|||||||
:aria-selected="activeTab === tab.key"
|
:aria-selected="activeTab === tab.key"
|
||||||
:aria-controls="`${componentId}-panel-${tab.key}`"
|
:aria-controls="`${componentId}-panel-${tab.key}`"
|
||||||
:aria-disabled="!!tab.disabled"
|
:aria-disabled="!!tab.disabled"
|
||||||
:tabindex="focusedKey === tab.key ? 0 : -1"
|
:tabindex="activeTab === tab.key ? 0 : -1"
|
||||||
:disabled="tab.disabled"
|
:disabled="tab.disabled"
|
||||||
:class="[
|
:class="[
|
||||||
'relative flex items-center gap-[18px] text-[24px] font-[600] transition-colors',
|
'relative flex items-center gap-[18px] text-[24px] font-[600] transition-colors',
|
||||||
@@ -110,8 +40,7 @@
|
|||||||
:id="`${componentId}-panel-${tab.key}`"
|
:id="`${componentId}-panel-${tab.key}`"
|
||||||
:key="tab.key"
|
:key="tab.key"
|
||||||
role="tabpanel"
|
role="tabpanel"
|
||||||
:aria-labelledby="isTabRendered(tab.key) ? `${componentId}-tab-${tab.key}` : undefined"
|
:aria-labelledby="`${componentId}-tab-${tab.key}`"
|
||||||
:aria-label="isTabRendered(tab.key) ? undefined : tab.label"
|
|
||||||
>
|
>
|
||||||
<slot :name="tab.key" />
|
<slot :name="tab.key" />
|
||||||
</div>
|
</div>
|
||||||
@@ -119,7 +48,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, ref, useId, watch} from 'vue'
|
import {computed, ref, useId} from 'vue'
|
||||||
import {Icon as IconifyIcon} from '@iconify/vue'
|
import {Icon as IconifyIcon} from '@iconify/vue'
|
||||||
|
|
||||||
defineOptions({name: 'MalioTabList', inheritAttrs: false})
|
defineOptions({name: 'MalioTabList', inheritAttrs: false})
|
||||||
@@ -136,13 +65,9 @@ const props = withDefaults(defineProps<{
|
|||||||
tabs: Tab[]
|
tabs: Tab[]
|
||||||
modelValue?: string
|
modelValue?: string
|
||||||
id?: string
|
id?: string
|
||||||
maxVisibleTabs?: number
|
|
||||||
maxWidth?: number
|
|
||||||
}>(), {
|
}>(), {
|
||||||
modelValue: undefined,
|
modelValue: undefined,
|
||||||
id: '',
|
id: '',
|
||||||
maxVisibleTabs: undefined,
|
|
||||||
maxWidth: 1100,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
@@ -159,53 +84,6 @@ const activeTab = computed(() =>
|
|||||||
isControlled.value ? props.modelValue! : localValue.value,
|
isControlled.value ? props.modelValue! : localValue.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
const isWindowed = computed(() =>
|
|
||||||
props.maxVisibleTabs != null && props.tabs.length > props.maxVisibleTabs,
|
|
||||||
)
|
|
||||||
|
|
||||||
const maxStartIndex = computed(() =>
|
|
||||||
isWindowed.value ? Math.max(0, props.tabs.length - props.maxVisibleTabs!) : 0,
|
|
||||||
)
|
|
||||||
|
|
||||||
const startIndex = ref(0)
|
|
||||||
|
|
||||||
const visibleTabs = computed(() =>
|
|
||||||
isWindowed.value
|
|
||||||
? props.tabs.slice(startIndex.value, startIndex.value + props.maxVisibleTabs!)
|
|
||||||
: props.tabs,
|
|
||||||
)
|
|
||||||
|
|
||||||
const focusedKey = computed(() => {
|
|
||||||
if (!isWindowed.value) return activeTab.value
|
|
||||||
const inView = visibleTabs.value.some(t => t.key === activeTab.value)
|
|
||||||
return inView ? activeTab.value : (visibleTabs.value[0]?.key ?? '')
|
|
||||||
})
|
|
||||||
|
|
||||||
const isTabRendered = (key: string) => !isWindowed.value || visibleTabs.value.some(t => t.key === key)
|
|
||||||
|
|
||||||
const canPrev = computed(() => isWindowed.value && startIndex.value > 0)
|
|
||||||
const canNext = computed(() => isWindowed.value && startIndex.value < maxStartIndex.value)
|
|
||||||
|
|
||||||
function prev() {
|
|
||||||
if (!canPrev.value) return
|
|
||||||
startIndex.value -= 1
|
|
||||||
}
|
|
||||||
|
|
||||||
function next() {
|
|
||||||
if (!canNext.value) return
|
|
||||||
startIndex.value += 1
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clamp startIndex back in range if tabs or maxVisibleTabs change.
|
|
||||||
watch(maxStartIndex, (max) => {
|
|
||||||
if (startIndex.value > max) startIndex.value = max
|
|
||||||
})
|
|
||||||
|
|
||||||
// Reset the window to the start when the tab list is replaced.
|
|
||||||
watch(() => props.tabs, () => {
|
|
||||||
startIndex.value = 0
|
|
||||||
})
|
|
||||||
|
|
||||||
function selectTab(key: string) {
|
function selectTab(key: string) {
|
||||||
const tab = props.tabs.find(t => t.key === key)
|
const tab = props.tabs.find(t => t.key === key)
|
||||||
if (tab?.disabled) return
|
if (tab?.disabled) return
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ type TimeProps = {
|
|||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const TimeForTest = Time as DefineComponent<TimeProps>
|
const TimeForTest = Time as DefineComponent<TimeProps>
|
||||||
@@ -77,33 +76,4 @@ describe('MalioTime', () => {
|
|||||||
expect(inputs[0].classes()).toContain('border-m-primary')
|
expect(inputs[0].classes()).toContain('border-m-primary')
|
||||||
expect(inputs[1].classes()).not.toContain('border-m-primary')
|
expect(inputs[1].classes()).not.toContain('border-m-primary')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountTime({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountTime({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountTime({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountTime({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountTime({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
:for="hoursInputId"
|
:for="hoursInputId"
|
||||||
:class="mergedLabelClass"
|
:class="mergedLabelClass"
|
||||||
>
|
>
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
{{ label }}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p
|
<p
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
v-if="hint || hasError || hasSuccess"
|
||||||
:id="`${inputId}-describedby`"
|
:id="`${inputId}-describedby`"
|
||||||
:class="[
|
:class="[
|
||||||
hasError
|
hasError
|
||||||
@@ -67,7 +67,6 @@
|
|||||||
? 'text-m-success'
|
? 'text-m-success'
|
||||||
: 'text-m-muted',
|
: 'text-m-muted',
|
||||||
'mt-1 ml-[2px] text-xs',
|
'mt-1 ml-[2px] text-xs',
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
]"
|
||||||
>
|
>
|
||||||
{{ error || success || hint }}
|
{{ error || success || hint }}
|
||||||
@@ -78,7 +77,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {computed, nextTick, ref, useAttrs, useId, watch} from 'vue'
|
import {computed, nextTick, ref, useAttrs, useId, watch} from 'vue'
|
||||||
import {twMerge} from 'tailwind-merge'
|
import {twMerge} from 'tailwind-merge'
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioTime', inheritAttrs: false})
|
defineOptions({name: 'MalioTime', inheritAttrs: false})
|
||||||
|
|
||||||
@@ -97,7 +95,6 @@ const props = withDefaults(
|
|||||||
hint?: string
|
hint?: string
|
||||||
error?: string
|
error?: string
|
||||||
success?: string
|
success?: string
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
}>(),
|
||||||
{
|
{
|
||||||
id: '',
|
id: '',
|
||||||
@@ -113,7 +110,6 @@ const props = withDefaults(
|
|||||||
hint: '',
|
hint: '',
|
||||||
error: '',
|
error: '',
|
||||||
success: '',
|
success: '',
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,143 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import type {DefineComponent} from 'vue'
|
|
||||||
import TimePicker from './TimePicker.vue'
|
|
||||||
|
|
||||||
type TimePickerProps = {
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
clearable?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
const TimePickerForTest = TimePicker as DefineComponent<TimePickerProps>
|
|
||||||
const mountPicker = (props: TimePickerProps = {}) =>
|
|
||||||
mount(TimePickerForTest, {props, attachTo: document.body})
|
|
||||||
|
|
||||||
describe('MalioTimePicker', () => {
|
|
||||||
it('affiche le label et l\'icône horloge', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Heure'})
|
|
||||||
expect(wrapper.get('label').text()).toBe('Heure')
|
|
||||||
expect(wrapper.find('[data-test="clock-icon"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche la valeur HH:MM dans le champ', () => {
|
|
||||||
const wrapper = mountPicker({modelValue: '14:30'})
|
|
||||||
const input = wrapper.get('[data-test="time-field"]').element as HTMLInputElement
|
|
||||||
expect(input.value).toBe('14:30')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('ouvre le popover à molettes au clic', async () => {
|
|
||||||
const wrapper = mountPicker()
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(false)
|
|
||||||
await wrapper.get('[data-test="time-field"]').trigger('click')
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(true)
|
|
||||||
expect(wrapper.find('[data-test="time-wheels"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'ouvre pas le popover si disabled', async () => {
|
|
||||||
const wrapper = mountPicker({disabled: true})
|
|
||||||
await wrapper.get('[data-test="time-field"]').trigger('click')
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'ouvre pas le popover si readonly', async () => {
|
|
||||||
const wrapper = mountPicker({readonly: true})
|
|
||||||
await wrapper.get('[data-test="time-field"]').trigger('click')
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('émet la valeur réglée depuis les molettes', async () => {
|
|
||||||
const wrapper = mountPicker({modelValue: '09:30'})
|
|
||||||
await wrapper.get('[data-test="time-field"]').trigger('click')
|
|
||||||
wrapper.findComponent({name: 'MalioTimeWheels'}).vm.$emit('update:modelValue', '10:30')
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['10:30'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('émet null au clic sur la croix', async () => {
|
|
||||||
const wrapper = mountPicker({modelValue: '14:30'})
|
|
||||||
await wrapper.get('[data-test="clear"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([null])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('positionne aria-invalid et describedby sur erreur', () => {
|
|
||||||
const wrapper = mountPicker({error: 'Heure requise'})
|
|
||||||
const input = wrapper.get('[data-test="time-field"]')
|
|
||||||
expect(input.attributes('aria-invalid')).toBe('true')
|
|
||||||
expect(input.attributes('aria-describedby')).toBeTruthy()
|
|
||||||
expect(wrapper.text()).toContain('Heure requise')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche l\'astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Champ', required: true})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n\'affiche pas l\'astérisque par défaut', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Champ'})
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : bordure noire sans bleu', () => {
|
|
||||||
const wrapper = mountPicker({readonly: true})
|
|
||||||
const input = wrapper.get('[data-test="time-field"]')
|
|
||||||
expect(input.classes()).toContain('border-black')
|
|
||||||
expect(input.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(input.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : label muted sans bleu', () => {
|
|
||||||
const wrapper = mountPicker({readonly: true, label: 'Heure'})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
expect(label.classes()).not.toContain('text-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly vide : icône horloge en text-m-muted', () => {
|
|
||||||
const wrapper = mountPicker({readonly: true, label: 'Heure'})
|
|
||||||
expect(wrapper.get('[data-test="clock-icon"]').classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label et icône en noir, bordure noire', () => {
|
|
||||||
const wrapper = mountPicker({readonly: true, label: 'Heure', modelValue: '14:30'})
|
|
||||||
const input = wrapper.get('[data-test="time-field"]')
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
const icon = wrapper.get('[data-test="clock-icon"]')
|
|
||||||
expect(input.classes()).toContain('border-black')
|
|
||||||
expect(input.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-black')
|
|
||||||
expect(icon.classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('réserve l’espace message par défaut même sans message', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Champ'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false sans message : pas de ligne réservée', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Champ', reserveMessageSpace: false})
|
|
||||||
expect(wrapper.find('[id$="-describedby"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('reserveMessageSpace=false avec message : ligne rendue sans min-h', () => {
|
|
||||||
const wrapper = mountPicker({label: 'Champ', reserveMessageSpace: false, error: 'Erreur'})
|
|
||||||
const msg = wrapper.find('[id$="-describedby"]')
|
|
||||||
expect(msg.exists()).toBe(true)
|
|
||||||
expect(msg.classes()).not.toContain('min-h-[1rem]')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,246 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div ref="root">
|
|
||||||
<div :class="mergedGroupClass">
|
|
||||||
<input
|
|
||||||
:id="inputId"
|
|
||||||
:name="name"
|
|
||||||
data-test="time-field"
|
|
||||||
readonly
|
|
||||||
autocomplete="off"
|
|
||||||
:class="mergedInputClass"
|
|
||||||
:required="required"
|
|
||||||
:disabled="disabled"
|
|
||||||
:value="displayValue"
|
|
||||||
:aria-invalid="!!error"
|
|
||||||
:aria-describedby="describedBy"
|
|
||||||
:aria-expanded="isOpen"
|
|
||||||
aria-haspopup="dialog"
|
|
||||||
v-bind="attrs"
|
|
||||||
placeholder="_"
|
|
||||||
type="text"
|
|
||||||
@click="onFieldClick"
|
|
||||||
>
|
|
||||||
|
|
||||||
<label
|
|
||||||
v-if="label"
|
|
||||||
:for="inputId"
|
|
||||||
:class="mergedLabelClass"
|
|
||||||
>
|
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div class="absolute right-3 top-1/2 flex -translate-y-1/2 items-center gap-1">
|
|
||||||
<button
|
|
||||||
v-if="showClear"
|
|
||||||
type="button"
|
|
||||||
data-test="clear"
|
|
||||||
class="text-m-muted hover:text-m-primary"
|
|
||||||
aria-label="Effacer l'heure"
|
|
||||||
@click.stop="onClear"
|
|
||||||
>
|
|
||||||
<Icon icon="mdi:close" :width="16" :height="16" />
|
|
||||||
</button>
|
|
||||||
<Icon
|
|
||||||
data-test="clock-icon"
|
|
||||||
icon="mdi:clock-outline"
|
|
||||||
:width="24"
|
|
||||||
:height="24"
|
|
||||||
:class="iconStateClass"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Mode overlay (par défaut) : popover absolu au-dessus du contenu suivant. -->
|
|
||||||
<div
|
|
||||||
v-if="isOpen && !staticPopover"
|
|
||||||
data-test="popover"
|
|
||||||
role="dialog"
|
|
||||||
class="absolute left-0 right-0 top-full z-20 box-border w-full bg-white shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]"
|
|
||||||
>
|
|
||||||
<TimeWheels
|
|
||||||
:model-value="wheelsValue"
|
|
||||||
@update:model-value="onWheelChange"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Mode statique : molette en flux (hors du groupe à hauteur fixe) → le
|
|
||||||
conteneur parent (ex. popover du DateTime) grandit pour l'englober. -->
|
|
||||||
<div
|
|
||||||
v-if="isOpen && staticPopover"
|
|
||||||
data-test="popover"
|
|
||||||
role="dialog"
|
|
||||||
class="relative mt-4 w-full bg-white shadow-[0_4px_4px_0_rgba(0,0,0,0.25)]"
|
|
||||||
>
|
|
||||||
<TimeWheels
|
|
||||||
:model-value="wheelsValue"
|
|
||||||
@update:model-value="onWheelChange"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p
|
|
||||||
v-if="reserveMessageSpace || hint || error || success"
|
|
||||||
:id="`${inputId}-describedby`"
|
|
||||||
:class="[
|
|
||||||
hasError ? 'text-m-danger' : hasSuccess ? 'text-m-success' : 'text-m-muted',
|
|
||||||
'mt-1 ml-[2px] text-xs',
|
|
||||||
reserveMessageSpace ? 'min-h-[1rem]' : '',
|
|
||||||
]"
|
|
||||||
>
|
|
||||||
{{ error || success || hint }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, onBeforeUnmount, onMounted, ref, useAttrs, useId} from 'vue'
|
|
||||||
import {Icon} from '@iconify/vue'
|
|
||||||
import {twMerge} from 'tailwind-merge'
|
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
import TimeWheels from './internal/TimeWheels.vue'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioTimePicker', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
clearable?: boolean
|
|
||||||
staticPopover?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
reserveMessageSpace?: boolean
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
label: '',
|
|
||||||
modelValue: undefined,
|
|
||||||
placeholder: 'HH:MM',
|
|
||||||
required: false,
|
|
||||||
disabled: false,
|
|
||||||
readonly: false,
|
|
||||||
hint: '',
|
|
||||||
error: '',
|
|
||||||
success: '',
|
|
||||||
clearable: true,
|
|
||||||
staticPopover: false,
|
|
||||||
inputClass: '',
|
|
||||||
labelClass: '',
|
|
||||||
groupClass: '',
|
|
||||||
reserveMessageSpace: true,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{(e: 'update:modelValue', value: string | null): void}>()
|
|
||||||
|
|
||||||
const attrs = useAttrs()
|
|
||||||
const generatedId = useId()
|
|
||||||
const root = ref<HTMLElement | null>(null)
|
|
||||||
const isOpen = ref(false)
|
|
||||||
const localValue = ref<string | null>(null)
|
|
||||||
|
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
|
||||||
const currentValue = computed(() => (isControlled.value ? props.modelValue : localValue.value))
|
|
||||||
|
|
||||||
const inputId = computed(() => props.id?.toString() || `malio-time-picker-${generatedId}`)
|
|
||||||
const hasError = computed(() => !!props.error)
|
|
||||||
const hasSuccess = computed(() => !!props.success && !hasError.value)
|
|
||||||
const displayValue = computed(() => currentValue.value ?? '')
|
|
||||||
const isFilled = computed(() => displayValue.value.length > 0)
|
|
||||||
const isReadonly = computed(() => props.readonly && !props.disabled)
|
|
||||||
const wheelsValue = computed(() => currentValue.value || '00:00')
|
|
||||||
const showClear = computed(() =>
|
|
||||||
props.clearable && isFilled.value && !props.disabled && !props.readonly,
|
|
||||||
)
|
|
||||||
const describedBy = computed(() =>
|
|
||||||
(props.hint || hasError.value || hasSuccess.value) ? `${inputId.value}-describedby` : undefined,
|
|
||||||
)
|
|
||||||
|
|
||||||
const commit = (value: string | null) => {
|
|
||||||
if (!isControlled.value) localValue.value = value
|
|
||||||
emit('update:modelValue', value)
|
|
||||||
}
|
|
||||||
|
|
||||||
const onWheelChange = (value: string) => commit(value)
|
|
||||||
|
|
||||||
const onClear = () => {
|
|
||||||
commit(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
const onFieldClick = () => {
|
|
||||||
if (props.disabled || props.readonly) return
|
|
||||||
isOpen.value = !isOpen.value
|
|
||||||
}
|
|
||||||
|
|
||||||
const onMouseDown = (event: MouseEvent) => {
|
|
||||||
if (!isOpen.value || !root.value) return
|
|
||||||
if (!root.value.contains(event.target as Node)) isOpen.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => document.addEventListener('mousedown', onMouseDown))
|
|
||||||
onBeforeUnmount(() => document.removeEventListener('mousedown', onMouseDown))
|
|
||||||
|
|
||||||
const mergedGroupClass = computed(() =>
|
|
||||||
twMerge('relative flex h-12 w-full items-center', props.groupClass),
|
|
||||||
)
|
|
||||||
|
|
||||||
const mergedInputClass = computed(() =>
|
|
||||||
twMerge(
|
|
||||||
'floating-input peer min-h-[40px] w-full cursor-pointer rounded-md border bg-white py-1 pl-3 pr-10 text-lg outline-none transition-[padding] duration-150 placeholder:text-transparent',
|
|
||||||
isReadonly.value
|
|
||||||
? 'border-black'
|
|
||||||
: isFilled.value ? 'border-black' : 'border-m-muted',
|
|
||||||
props.disabled ? 'cursor-not-allowed border-m-muted text-black/60' : '',
|
|
||||||
hasError.value
|
|
||||||
? 'border-m-danger'
|
|
||||||
: hasSuccess.value
|
|
||||||
? 'border-m-success'
|
|
||||||
: isReadonly.value ? '' : 'focus:border-m-primary',
|
|
||||||
(!isReadonly.value && isOpen.value) ? 'border-m-primary !rounded-b-none !py-[9px]' : '',
|
|
||||||
props.inputClass,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
const mergedLabelClass = computed(() =>
|
|
||||||
twMerge(
|
|
||||||
'floating-label absolute left-3 top-2 mt-[5px] inline-block origin-left text-sm font-medium transition-transform duration-150',
|
|
||||||
(isReadonly.value ? isFilled.value : (isFilled.value || isOpen.value)) ? '-translate-y-[1.25rem] scale-90' : '',
|
|
||||||
hasError.value
|
|
||||||
? 'text-m-danger'
|
|
||||||
: hasSuccess.value
|
|
||||||
? 'text-m-success'
|
|
||||||
: isReadonly.value
|
|
||||||
? isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
: isOpen.value
|
|
||||||
? 'text-m-primary'
|
|
||||||
: 'text-black peer-placeholder-shown:text-m-muted',
|
|
||||||
props.labelClass,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
const iconStateClass = computed(() => {
|
|
||||||
if (hasError.value) return 'text-m-danger'
|
|
||||||
if (hasSuccess.value) return 'text-m-success'
|
|
||||||
if (isReadonly.value) return isFilled.value ? 'text-black' : 'text-m-muted'
|
|
||||||
if (isOpen.value) return 'text-m-primary'
|
|
||||||
if (isFilled.value) return 'text-black'
|
|
||||||
return 'text-m-muted'
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.floating-label {
|
|
||||||
background: white;
|
|
||||||
padding: 0 0.25rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {clampHours, clampMinutes, formatTime, padSegment, parseTime} from './timeFormat'
|
|
||||||
|
|
||||||
describe('timeFormat', () => {
|
|
||||||
it('parse une chaîne HH:MM valide', () => {
|
|
||||||
expect(parseTime('09:05')).toEqual({hours: 9, minutes: 5})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renvoie null pour vide ou invalide', () => {
|
|
||||||
expect(parseTime('')).toBeNull()
|
|
||||||
expect(parseTime(null)).toBeNull()
|
|
||||||
expect(parseTime('abc')).toBeNull()
|
|
||||||
expect(parseTime('12')).toBeNull()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('clamp les valeurs hors bornes au parsing', () => {
|
|
||||||
expect(parseTime('99:88')).toEqual({hours: 23, minutes: 59})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('formate avec zéro-padding', () => {
|
|
||||||
expect(formatTime(9, 5)).toBe('09:05')
|
|
||||||
expect(formatTime(0, 0)).toBe('00:00')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('clamp et pad les helpers', () => {
|
|
||||||
expect(clampHours(30)).toBe(23)
|
|
||||||
expect(clampHours(-2)).toBe(0)
|
|
||||||
expect(clampMinutes(75)).toBe(59)
|
|
||||||
expect(padSegment(7)).toBe('07')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
export interface TimeParts {
|
|
||||||
hours: number
|
|
||||||
minutes: number
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clampHours(value: number): number {
|
|
||||||
if (Number.isNaN(value)) return 0
|
|
||||||
return Math.min(23, Math.max(0, Math.trunc(value)))
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clampMinutes(value: number): number {
|
|
||||||
if (Number.isNaN(value)) return 0
|
|
||||||
return Math.min(59, Math.max(0, Math.trunc(value)))
|
|
||||||
}
|
|
||||||
|
|
||||||
export function padSegment(value: number): string {
|
|
||||||
return value.toString().padStart(2, '0')
|
|
||||||
}
|
|
||||||
|
|
||||||
export function parseTime(value: string | null | undefined): TimeParts | null {
|
|
||||||
if (!value) return null
|
|
||||||
const match = /^(\d{1,2}):(\d{1,2})$/.exec(value.trim())
|
|
||||||
if (!match) return null
|
|
||||||
return {
|
|
||||||
hours: clampHours(Number.parseInt(match[1], 10)),
|
|
||||||
minutes: clampMinutes(Number.parseInt(match[2], 10)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function formatTime(hours: number, minutes: number): string {
|
|
||||||
return `${padSegment(clampHours(hours))}:${padSegment(clampMinutes(minutes))}`
|
|
||||||
}
|
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
import {describe, expect, it, vi} from 'vitest'
|
|
||||||
import {defineComponent, nextTick, ref} from 'vue'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import {
|
|
||||||
CENTER_OFFSET,
|
|
||||||
VISIBLE_ROWS,
|
|
||||||
loopCorrection,
|
|
||||||
scrollTopForValueIndex,
|
|
||||||
useInfiniteWheel,
|
|
||||||
valueIndexFromScroll,
|
|
||||||
} from './useInfiniteWheel'
|
|
||||||
|
|
||||||
const H = 40 // itemHeight
|
|
||||||
const LEN = 24 // ex. heures
|
|
||||||
|
|
||||||
describe('useInfiniteWheel — math pure', () => {
|
|
||||||
it('expose 5 lignes visibles et un offset central de 2', () => {
|
|
||||||
expect(VISIBLE_ROWS).toBe(5)
|
|
||||||
expect(CENTER_OFFSET).toBe(2)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('scrollTopForValueIndex et valueIndexFromScroll font un aller-retour', () => {
|
|
||||||
for (const index of [0, 1, 9, 23]) {
|
|
||||||
const top = scrollTopForValueIndex(index, H, LEN)
|
|
||||||
expect(valueIndexFromScroll(top, H, LEN)).toBe(index)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
it('valueIndexFromScroll boucle en modulo', () => {
|
|
||||||
const top = scrollTopForValueIndex(0, H, LEN)
|
|
||||||
expect(valueIndexFromScroll(top + LEN * H, H, LEN)).toBe(0)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('loopCorrection laisse le scroll de la copie du milieu inchangé', () => {
|
|
||||||
const top = scrollTopForValueIndex(12, H, LEN)
|
|
||||||
expect(loopCorrection(top, H, LEN)).toBe(top)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('loopCorrection ramène vers le milieu quand on dérive vers le haut', () => {
|
|
||||||
const drifted = scrollTopForValueIndex(0, H, LEN) - LEN * H
|
|
||||||
expect(loopCorrection(drifted, H, LEN)).toBe(drifted + LEN * H)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('loopCorrection ramène vers le milieu quand on dérive vers le bas', () => {
|
|
||||||
const drifted = scrollTopForValueIndex(0, H, LEN) + LEN * H
|
|
||||||
expect(loopCorrection(drifted, H, LEN)).toBe(drifted - LEN * H)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
function mountWheelHarness(initialIndex: number, onChange: (i: number) => void) {
|
|
||||||
let api!: ReturnType<typeof useInfiniteWheel>
|
|
||||||
const Harness = defineComponent({
|
|
||||||
setup() {
|
|
||||||
const container = ref<HTMLElement | null>(null)
|
|
||||||
api = useInfiniteWheel(container, {
|
|
||||||
length: 24,
|
|
||||||
itemHeight: 40,
|
|
||||||
initialIndex: () => initialIndex,
|
|
||||||
onChange,
|
|
||||||
})
|
|
||||||
return {container}
|
|
||||||
},
|
|
||||||
template: '<div ref="container" style="height:200px;overflow:auto"><div style="height:2880px" /></div>',
|
|
||||||
})
|
|
||||||
const wrapper = mount(Harness, {attachTo: document.body})
|
|
||||||
return {wrapper, api: () => api}
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('useInfiniteWheel — composable', () => {
|
|
||||||
it('step(+1) émet l\'index suivant', async () => {
|
|
||||||
const changes: number[] = []
|
|
||||||
const {api} = mountWheelHarness(9, (i) => changes.push(i))
|
|
||||||
await nextTick()
|
|
||||||
api().step(1)
|
|
||||||
expect(changes.at(-1)).toBe(10)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('step boucle de 23 à 0', async () => {
|
|
||||||
const changes: number[] = []
|
|
||||||
const {api} = mountWheelHarness(23, (i) => changes.push(i))
|
|
||||||
await nextTick()
|
|
||||||
api().step(1)
|
|
||||||
expect(changes.at(-1)).toBe(0)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('onKeydown ArrowUp décrémente (avec wrap)', async () => {
|
|
||||||
const changes: number[] = []
|
|
||||||
const {api} = mountWheelHarness(0, (i) => changes.push(i))
|
|
||||||
await nextTick()
|
|
||||||
api().onKeydown(new KeyboardEvent('keydown', {key: 'ArrowUp'}))
|
|
||||||
expect(changes.at(-1)).toBe(23)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Anti-boucle navigateur : un scroll programmatique déclenche une rafale d'évènements
|
|
||||||
// scroll (animation/snap). Ils ne doivent PAS être pris pour du scroll utilisateur,
|
|
||||||
// sinon settle() ré-émet en boucle et corrompt le patch DOM de Vue.
|
|
||||||
it('n\'émet pas en double quand un scroll programmatique déclenche une rafale de scroll', async () => {
|
|
||||||
vi.useFakeTimers()
|
|
||||||
try {
|
|
||||||
const changes: number[] = []
|
|
||||||
const {wrapper, api} = mountWheelHarness(9, (i) => changes.push(i))
|
|
||||||
await nextTick()
|
|
||||||
const el = wrapper.element as HTMLElement
|
|
||||||
changes.length = 0
|
|
||||||
|
|
||||||
api().scrollToIndex(12)
|
|
||||||
|
|
||||||
el.dispatchEvent(new Event('scroll'))
|
|
||||||
el.dispatchEvent(new Event('scroll'))
|
|
||||||
el.dispatchEvent(new Event('scroll'))
|
|
||||||
|
|
||||||
vi.advanceTimersByTime(300)
|
|
||||||
|
|
||||||
expect(changes).toEqual([12])
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
vi.useRealTimers()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
import {onBeforeUnmount, onMounted, ref, type Ref} from 'vue'
|
|
||||||
|
|
||||||
export const VISIBLE_ROWS = 5
|
|
||||||
export const CENTER_OFFSET = (VISIBLE_ROWS - 1) / 2 // 2
|
|
||||||
|
|
||||||
/** Index de valeur logique (0..length-1) centré pour un scrollTop donné. */
|
|
||||||
export function valueIndexFromScroll(scrollTop: number, itemHeight: number, length: number): number {
|
|
||||||
const flat = Math.round(scrollTop / itemHeight) + CENTER_OFFSET
|
|
||||||
return ((flat % length) + length) % length
|
|
||||||
}
|
|
||||||
|
|
||||||
/** scrollTop qui centre l'index donné dans la copie du milieu (buffer à 3 copies). */
|
|
||||||
export function scrollTopForValueIndex(valueIndex: number, itemHeight: number, length: number): number {
|
|
||||||
const flat = length + valueIndex - CENTER_OFFSET
|
|
||||||
return flat * itemHeight
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Recentre le scrollTop dans la copie du milieu [length, 2*length) si on a dérivé. */
|
|
||||||
export function loopCorrection(scrollTop: number, itemHeight: number, length: number): number {
|
|
||||||
const block = length * itemHeight
|
|
||||||
const centeredFlat = Math.round(scrollTop / itemHeight) + CENTER_OFFSET
|
|
||||||
if (centeredFlat < length) return scrollTop + block
|
|
||||||
if (centeredFlat >= 2 * length) return scrollTop - block
|
|
||||||
return scrollTop
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UseInfiniteWheelOptions {
|
|
||||||
length: number
|
|
||||||
itemHeight: number
|
|
||||||
initialIndex: () => number
|
|
||||||
onChange: (index: number) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useInfiniteWheel(
|
|
||||||
containerRef: Ref<HTMLElement | null>,
|
|
||||||
options: UseInfiniteWheelOptions,
|
|
||||||
) {
|
|
||||||
const centeredIndex = ref(options.initialIndex())
|
|
||||||
let scrollEndTimer: ReturnType<typeof setTimeout> | null = null
|
|
||||||
// Fenêtre de suppression : ignore les évènements scroll provoqués par NOS
|
|
||||||
// repositionnements programmatiques (et les réajustements de scroll-snap), qui
|
|
||||||
// arrivent en rafale. Un booléen one-shot n'en absorberait qu'un seul : les
|
|
||||||
// suivants seraient pris pour du scroll utilisateur → settle() → onChange en
|
|
||||||
// boucle (re-render ré-entrant qui corrompt le patch DOM dans le navigateur).
|
|
||||||
let suppressed = false
|
|
||||||
let suppressTimer: ReturnType<typeof setTimeout> | null = null
|
|
||||||
|
|
||||||
// Scroll programmatique INSTANTANÉ : pas de 'smooth', dont l'animation multi-frames
|
|
||||||
// émettrait justement la rafale d'évènements scroll problématique.
|
|
||||||
function applyScroll(top: number) {
|
|
||||||
const el = containerRef.value
|
|
||||||
if (!el) return
|
|
||||||
suppressed = true
|
|
||||||
if (suppressTimer) clearTimeout(suppressTimer)
|
|
||||||
suppressTimer = setTimeout(() => { suppressed = false }, 100)
|
|
||||||
el.scrollTop = top
|
|
||||||
}
|
|
||||||
|
|
||||||
function readCentered() {
|
|
||||||
const el = containerRef.value
|
|
||||||
if (!el) return
|
|
||||||
centeredIndex.value = valueIndexFromScroll(el.scrollTop, options.itemHeight, options.length)
|
|
||||||
}
|
|
||||||
|
|
||||||
function settle() {
|
|
||||||
const el = containerRef.value
|
|
||||||
if (!el) return
|
|
||||||
readCentered()
|
|
||||||
options.onChange(centeredIndex.value)
|
|
||||||
const corrected = loopCorrection(el.scrollTop, options.itemHeight, options.length)
|
|
||||||
if (corrected !== el.scrollTop) applyScroll(corrected)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onScroll() {
|
|
||||||
if (suppressed) return
|
|
||||||
readCentered()
|
|
||||||
if (scrollEndTimer) clearTimeout(scrollEndTimer)
|
|
||||||
scrollEndTimer = setTimeout(settle, 120)
|
|
||||||
}
|
|
||||||
|
|
||||||
function scrollToIndex(index: number) {
|
|
||||||
centeredIndex.value = index
|
|
||||||
applyScroll(scrollTopForValueIndex(index, options.itemHeight, options.length))
|
|
||||||
options.onChange(index)
|
|
||||||
}
|
|
||||||
|
|
||||||
function step(delta: number) {
|
|
||||||
const next = (((centeredIndex.value + delta) % options.length) + options.length) % options.length
|
|
||||||
scrollToIndex(next)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onKeydown(event: KeyboardEvent) {
|
|
||||||
if (event.key === 'ArrowUp') {
|
|
||||||
event.preventDefault()
|
|
||||||
step(-1)
|
|
||||||
}
|
|
||||||
else if (event.key === 'ArrowDown') {
|
|
||||||
event.preventDefault()
|
|
||||||
step(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
const el = containerRef.value
|
|
||||||
if (!el) return
|
|
||||||
el.addEventListener('scroll', onScroll, {passive: true})
|
|
||||||
applyScroll(scrollTopForValueIndex(options.initialIndex(), options.itemHeight, options.length))
|
|
||||||
})
|
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
|
||||||
containerRef.value?.removeEventListener('scroll', onScroll)
|
|
||||||
if (scrollEndTimer) clearTimeout(scrollEndTimer)
|
|
||||||
if (suppressTimer) clearTimeout(suppressTimer)
|
|
||||||
})
|
|
||||||
|
|
||||||
return {centeredIndex, scrollToIndex, step, onKeydown}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import TimeWheel from './TimeWheel.vue'
|
|
||||||
|
|
||||||
const HOURS = Array.from({length: 24}, (_, i) => i)
|
|
||||||
|
|
||||||
const mountWheel = (modelValue = 9) =>
|
|
||||||
mount(TimeWheel, {
|
|
||||||
props: {modelValue, values: HOURS, ariaLabel: 'Heures'},
|
|
||||||
attachTo: document.body,
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('MalioTimeWheel', () => {
|
|
||||||
it('expose le rôle spinbutton et les attributs aria', () => {
|
|
||||||
const wrapper = mountWheel(9)
|
|
||||||
const el = wrapper.get('[role="spinbutton"]')
|
|
||||||
expect(el.attributes('aria-label')).toBe('Heures')
|
|
||||||
expect(el.attributes('aria-valuenow')).toBe('9')
|
|
||||||
expect(el.attributes('aria-valuemin')).toBe('0')
|
|
||||||
expect(el.attributes('aria-valuemax')).toBe('23')
|
|
||||||
expect(el.attributes('aria-valuetext')).toBe('09')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('rend 3 copies des valeurs (buffer infini)', () => {
|
|
||||||
const wrapper = mountWheel()
|
|
||||||
expect(wrapper.findAll('[data-test="wheel-item"]')).toHaveLength(24 * 3)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('émet la nouvelle valeur au clavier ArrowDown', async () => {
|
|
||||||
const wrapper = mountWheel(9)
|
|
||||||
await wrapper.get('[role="spinbutton"]').trigger('keydown', {key: 'ArrowDown'})
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([10])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('émet la valeur cliquée', async () => {
|
|
||||||
const wrapper = mountWheel(9)
|
|
||||||
const item = wrapper.findAll('[data-test="wheel-item"]').find((w) => w.text() === '11')!
|
|
||||||
await item.trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([11])
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div
|
|
||||||
ref="container"
|
|
||||||
class="malio-wheel relative h-[160px] w-14 snap-y snap-mandatory overflow-y-scroll"
|
|
||||||
role="spinbutton"
|
|
||||||
:tabindex="0"
|
|
||||||
:aria-label="ariaLabel"
|
|
||||||
:aria-valuenow="modelValue"
|
|
||||||
:aria-valuemin="values[0]"
|
|
||||||
:aria-valuemax="values[values.length - 1]"
|
|
||||||
:aria-valuetext="pad(modelValue)"
|
|
||||||
@keydown="onKeydown"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
v-for="item in buffer"
|
|
||||||
:key="item.key"
|
|
||||||
type="button"
|
|
||||||
data-test="wheel-item"
|
|
||||||
class="flex h-8 w-full snap-center items-center justify-center leading-none outline-none transition-all"
|
|
||||||
:class="itemClass(item.flat)"
|
|
||||||
tabindex="-1"
|
|
||||||
@click="onItemClick(item.value)"
|
|
||||||
>
|
|
||||||
{{ pad(item.value) }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, ref, watch} from 'vue'
|
|
||||||
import {useInfiniteWheel} from '../composables/useInfiniteWheel'
|
|
||||||
import {padSegment} from '../composables/timeFormat'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioTimeWheel', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
modelValue: number
|
|
||||||
values: number[]
|
|
||||||
ariaLabel: string
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const emit = defineEmits<{(e: 'update:modelValue', value: number): void}>()
|
|
||||||
|
|
||||||
const ITEM_HEIGHT = 32
|
|
||||||
const container = ref<HTMLElement | null>(null)
|
|
||||||
|
|
||||||
const pad = (value: number) => padSegment(value)
|
|
||||||
const indexOfValue = (value: number) => Math.max(0, props.values.indexOf(value))
|
|
||||||
|
|
||||||
const {centeredIndex, scrollToIndex, onKeydown} = useInfiniteWheel(container, {
|
|
||||||
length: props.values.length,
|
|
||||||
itemHeight: ITEM_HEIGHT,
|
|
||||||
initialIndex: () => indexOfValue(props.modelValue),
|
|
||||||
onChange: (index) => emit('update:modelValue', props.values[index]),
|
|
||||||
})
|
|
||||||
|
|
||||||
const buffer = computed(() =>
|
|
||||||
[0, 1, 2].flatMap((copy) =>
|
|
||||||
props.values.map((value, i) => {
|
|
||||||
const flat = copy * props.values.length + i
|
|
||||||
return {value, flat, key: flat}
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
// Taille décroissante avec la distance au centre (effet molette iOS).
|
|
||||||
const itemClass = (flat: number) => {
|
|
||||||
const distance = Math.abs(flat - (props.values.length + centeredIndex.value))
|
|
||||||
if (distance === 0) return 'text-[16px] font-medium text-black'
|
|
||||||
if (distance === 1) return 'text-[14px] text-m-muted'
|
|
||||||
return 'text-[12px] text-m-muted'
|
|
||||||
}
|
|
||||||
|
|
||||||
const onItemClick = (value: number) => scrollToIndex(indexOfValue(value))
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.modelValue,
|
|
||||||
(value) => {
|
|
||||||
if (props.values[centeredIndex.value] !== value) scrollToIndex(indexOfValue(value))
|
|
||||||
},
|
|
||||||
)
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.malio-wheel {
|
|
||||||
scrollbar-width: none;
|
|
||||||
/* Estompe les valeurs en haut et en bas (effet molette iOS) pour qu'elles ne
|
|
||||||
débordent pas visuellement du cadre. */
|
|
||||||
-webkit-mask-image: linear-gradient(to bottom, transparent 0%, #000 30%, #000 70%, transparent 100%);
|
|
||||||
mask-image: linear-gradient(to bottom, transparent 0%, #000 30%, #000 70%, transparent 100%);
|
|
||||||
}
|
|
||||||
.malio-wheel::-webkit-scrollbar {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import TimeWheels from './TimeWheels.vue'
|
|
||||||
import TimeWheel from './TimeWheel.vue'
|
|
||||||
|
|
||||||
const mountWheels = (modelValue = '09:30') =>
|
|
||||||
mount(TimeWheels, {props: {modelValue}, attachTo: document.body})
|
|
||||||
|
|
||||||
describe('MalioTimeWheels', () => {
|
|
||||||
it('rend deux molettes (heures + minutes) et un séparateur', () => {
|
|
||||||
const wrapper = mountWheels('09:30')
|
|
||||||
const wheels = wrapper.findAllComponents(TimeWheel)
|
|
||||||
expect(wheels).toHaveLength(2)
|
|
||||||
expect(wheels[0].props('ariaLabel')).toBe('Heures')
|
|
||||||
expect(wheels[1].props('ariaLabel')).toBe('Minutes')
|
|
||||||
expect(wrapper.text()).toContain(':')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('splitte modelValue vers les bonnes molettes', () => {
|
|
||||||
const wrapper = mountWheels('09:30')
|
|
||||||
const wheels = wrapper.findAllComponents(TimeWheel)
|
|
||||||
expect(wheels[0].props('modelValue')).toBe(9)
|
|
||||||
expect(wheels[1].props('modelValue')).toBe(30)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('recompose et émet HH:MM quand l\'heure change', async () => {
|
|
||||||
const wrapper = mountWheels('09:30')
|
|
||||||
const wheels = wrapper.findAllComponents(TimeWheel)
|
|
||||||
wheels[0].vm.$emit('update:modelValue', 14)
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['14:30'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('recompose et émet HH:MM quand la minute change', async () => {
|
|
||||||
const wrapper = mountWheels('09:30')
|
|
||||||
const wheels = wrapper.findAllComponents(TimeWheel)
|
|
||||||
wheels[1].vm.$emit('update:modelValue', 5)
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['09:05'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('par défaut 00:00 quand modelValue est vide', () => {
|
|
||||||
const wrapper = mountWheels('')
|
|
||||||
const wheels = wrapper.findAllComponents(TimeWheel)
|
|
||||||
expect(wheels[0].props('modelValue')).toBe(0)
|
|
||||||
expect(wheels[1].props('modelValue')).toBe(0)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div
|
|
||||||
data-test="time-wheels"
|
|
||||||
class="relative flex items-center justify-center gap-3 py-2"
|
|
||||||
>
|
|
||||||
<!-- bande centrale (overlay, traverse les 2 colonnes) -->
|
|
||||||
<div
|
|
||||||
class="pointer-events-none absolute inset-x-2 top-1/2 z-0 h-8 mx-3 -translate-y-1/2 rounded-lg bg-m-primary-light"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<MalioTimeWheel
|
|
||||||
:model-value="hours"
|
|
||||||
:values="HOURS"
|
|
||||||
aria-label="Heures"
|
|
||||||
class="relative z-10"
|
|
||||||
@update:model-value="onHours"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<span class="relative z-10 text-[14px] font-bold text-black">:</span>
|
|
||||||
|
|
||||||
<MalioTimeWheel
|
|
||||||
:model-value="minutes"
|
|
||||||
:values="MINUTES"
|
|
||||||
aria-label="Minutes"
|
|
||||||
class="relative z-10"
|
|
||||||
@update:model-value="onMinutes"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed} from 'vue'
|
|
||||||
import MalioTimeWheel from './TimeWheel.vue'
|
|
||||||
import {formatTime, parseTime} from '../composables/timeFormat'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioTimeWheels', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{modelValue?: string | null}>(),
|
|
||||||
{modelValue: ''},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{(e: 'update:modelValue', value: string): void}>()
|
|
||||||
|
|
||||||
const HOURS = Array.from({length: 24}, (_, i) => i)
|
|
||||||
const MINUTES = Array.from({length: 60}, (_, i) => i)
|
|
||||||
|
|
||||||
const parts = computed(() => parseTime(props.modelValue) ?? {hours: 0, minutes: 0})
|
|
||||||
const hours = computed(() => parts.value.hours)
|
|
||||||
const minutes = computed(() => parts.value.minutes)
|
|
||||||
|
|
||||||
const onHours = (value: number) => emit('update:modelValue', formatTime(value, minutes.value))
|
|
||||||
const onMinutes = (value: number) => emit('update:modelValue', formatTime(hours.value, value))
|
|
||||||
</script>
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Story title="Disclosure/Accordion">
|
|
||||||
<div class="grid grid-cols-1 gap-6">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Multiple (filtres) — défaut</h2>
|
|
||||||
<MalioAccordion v-model="multiple">
|
|
||||||
<MalioAccordionItem title="Prix" value="prix">
|
|
||||||
<p>Slider de prix ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Catégorie" value="cat">
|
|
||||||
<p>Liste de checkboxes ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Marque" value="marque">
|
|
||||||
<p>Recherche + liste ici…</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Single (FAQ)</h2>
|
|
||||||
<MalioAccordion v-model="single" mode="single">
|
|
||||||
<MalioAccordionItem title="Question 1" value="q1">
|
|
||||||
<p>Réponse 1</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Question 2" value="q2">
|
|
||||||
<p>Réponse 2</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Section désactivée</h2>
|
|
||||||
<MalioAccordion>
|
|
||||||
<MalioAccordionItem title="Active" value="ok">
|
|
||||||
<p>Contenu accessible</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
<MalioAccordionItem title="Désactivée" value="ko" :disabled="true">
|
|
||||||
<p>Inaccessible</p>
|
|
||||||
</MalioAccordionItem>
|
|
||||||
</MalioAccordion>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<docs lang="md">
|
|
||||||
# MalioAccordion
|
|
||||||
|
|
||||||
Accordéon compositionnel : un parent `MalioAccordion` qui enveloppe des
|
|
||||||
`MalioAccordionItem`. Conçu pour des systèmes de filtres (plusieurs sections
|
|
||||||
dépliées simultanément) comme pour des FAQ (une seule section ouverte).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Props — MalioAccordion
|
|
||||||
|
|
||||||
### mode
|
|
||||||
- Type: `'single' | 'multiple'`
|
|
||||||
- Défaut: `'multiple'`
|
|
||||||
- Description: `multiple` autorise plusieurs panneaux ouverts ; `single` ferme les autres à l'ouverture.
|
|
||||||
|
|
||||||
### modelValue
|
|
||||||
- Type: `string | string[]`
|
|
||||||
- Description: clés ouvertes. `string[]` en mode `multiple`, `string` en mode `single`. Sans v-model, état interne (non contrôlé).
|
|
||||||
|
|
||||||
### id
|
|
||||||
- Type: `string`
|
|
||||||
- Description: préfixe des IDs d'accessibilité. Auto-généré si absent.
|
|
||||||
|
|
||||||
### groupClass
|
|
||||||
- Type: `string`
|
|
||||||
- Description: classes du conteneur, fusionnées via `twMerge`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Props — MalioAccordionItem
|
|
||||||
|
|
||||||
### title
|
|
||||||
- Type: `string` (requis) — texte de l'en-tête.
|
|
||||||
|
|
||||||
### value
|
|
||||||
- Type: `string` — clé unique de la section (recommandée pour piloter le v-model). Auto-générée si absente.
|
|
||||||
|
|
||||||
### defaultOpen
|
|
||||||
- Type: `boolean` — défaut `false`. Ouvre la section au montage (mode non contrôlé uniquement).
|
|
||||||
|
|
||||||
### disabled
|
|
||||||
- Type: `boolean` — défaut `false`. En-tête non cliquable.
|
|
||||||
|
|
||||||
### headerClass / panelClass
|
|
||||||
- Type: `string` — override des classes de l'en-tête / du panneau (`twMerge`).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Slots
|
|
||||||
|
|
||||||
Slot par défaut de `MalioAccordionItem` = contenu du panneau.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Accessibilité
|
|
||||||
|
|
||||||
- En-tête = `<button>` natif, `aria-expanded`, `aria-controls`.
|
|
||||||
- Panneau `role="region"` + `aria-labelledby`.
|
|
||||||
- Sections désactivées : `disabled` + `aria-disabled`.
|
|
||||||
- Navigation clavier ↑/↓ entre les en-têtes.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Events
|
|
||||||
|
|
||||||
### update:modelValue
|
|
||||||
- Émis à chaque bascule. Retourne `string[]` (mode `multiple`) ou `string` (mode `single`, `''` si tout fermé).
|
|
||||||
</docs>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
import MalioAccordion from '../../components/malio/accordion/Accordion.vue'
|
|
||||||
import MalioAccordionItem from '../../components/malio/accordion/AccordionItem.vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'AccordionStory' })
|
|
||||||
|
|
||||||
const multiple = ref<string[]>(['prix'])
|
|
||||||
const single = ref('q1')
|
|
||||||
</script>
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Story title="Date/DateTime">
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Simple</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="simpleValue"
|
|
||||||
label="Date et heure"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Valeur initiale</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Rendez-vous"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec min/max</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="boundedValue"
|
|
||||||
label="Créneau"
|
|
||||||
:min="todayIso"
|
|
||||||
:max="maxIso"
|
|
||||||
hint="Entre aujourd'hui et +30 jours"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Erreur</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="errorValue"
|
|
||||||
label="Date limite"
|
|
||||||
error="Date et heure requises"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Désactivé</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Désactivé"
|
|
||||||
disabled
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Lecture seule"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
import MalioDateTime from '../../components/malio/date/DateTime.vue'
|
|
||||||
|
|
||||||
const pad = (n: number) => String(n).padStart(2, '0')
|
|
||||||
const toIso = (d: Date) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T00:00:00`
|
|
||||||
|
|
||||||
const now = new Date()
|
|
||||||
const todayIso = toIso(now)
|
|
||||||
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
|
||||||
|
|
||||||
const simpleValue = ref<string | null>(null)
|
|
||||||
const initialValue = ref<string | null>('2026-05-20T14:30:00')
|
|
||||||
const boundedValue = ref<string | null>(null)
|
|
||||||
const errorValue = ref<string | null>(null)
|
|
||||||
</script>
|
|
||||||
@@ -45,7 +45,7 @@ const showNoDismiss = ref(false)
|
|||||||
</div>
|
</div>
|
||||||
</Variant>
|
</Variant>
|
||||||
|
|
||||||
<Variant title="Avec footer d'actions">
|
<Variant title="Avec footer collant">
|
||||||
<div class="p-4">
|
<div class="p-4">
|
||||||
<button
|
<button
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
||||||
@@ -62,7 +62,9 @@ const showNoDismiss = ref(false)
|
|||||||
<MalioInputText label="Prénom" />
|
<MalioInputText label="Prénom" />
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<div class="sticky bottom-0 flex gap-3 bg-white py-4">
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="showForm = false" />
|
<MalioButton label="Enregistrer" button-class="flex-1" @click="showForm = false" />
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</MalioDrawer>
|
</MalioDrawer>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,70 +0,0 @@
|
|||||||
<script setup lang="ts">
|
|
||||||
import { ref } from 'vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'ModalStory' })
|
|
||||||
|
|
||||||
const showBase = ref(false)
|
|
||||||
const showForm = ref(false)
|
|
||||||
const showNoDismiss = ref(false)
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<Story title="Overlay/Modal">
|
|
||||||
<Variant title="Simple">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showBase = true"
|
|
||||||
>
|
|
||||||
Ouvrir
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showBase">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Détails</h2>
|
|
||||||
</template>
|
|
||||||
<p>Contenu simple de la modal.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
|
|
||||||
<Variant title="Avec footer d'actions">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showForm = true"
|
|
||||||
>
|
|
||||||
Ouvrir le formulaire
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showForm" modal-class="max-w-lg">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Nouveau contact</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4 py-2">
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<MalioInputText label="Prénom" />
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="showForm = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
|
|
||||||
<Variant title="Non dismissable">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showNoDismiss = true"
|
|
||||||
>
|
|
||||||
Ouvrir
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showNoDismiss" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Action requise</h2>
|
|
||||||
</template>
|
|
||||||
<p>Ni le backdrop ni Échap ne ferment cette modal. Utilisez la croix.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Story title="Time/TimePicker">
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Simple</h2>
|
|
||||||
<MalioTimePicker v-model="simpleValue" label="Heure" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Valeur initiale</h2>
|
|
||||||
<MalioTimePicker v-model="initialValue" label="Heure de départ" hint="Format HH:MM" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Désactivé</h2>
|
|
||||||
<MalioTimePicker v-model="disabledValue" label="Heure verrouillée" disabled />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Erreur</h2>
|
|
||||||
<MalioTimePicker v-model="errorValue" label="Heure de fermeture" error="Heure invalide" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Succès</h2>
|
|
||||||
<MalioTimePicker v-model="successValue" label="Heure confirmée" success="Horaire enregistré" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
import MalioTimePicker from '../../components/malio/time/TimePicker.vue'
|
|
||||||
|
|
||||||
const simpleValue = ref('')
|
|
||||||
const initialValue = ref('08:30')
|
|
||||||
const disabledValue = ref('14:15')
|
|
||||||
const errorValue = ref('25:90')
|
|
||||||
const successValue = ref('09:00')
|
|
||||||
</script>
|
|
||||||
@@ -1,712 +0,0 @@
|
|||||||
# MalioDateTime Implementation Plan
|
|
||||||
|
|
||||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
|
||||||
|
|
||||||
**Goal:** Ajouter un composant `MalioDateTime` (date + heure dans un seul champ) à la famille temporelle de `@malio/layer-ui`, en version intérimaire avec `<input type="time">` natif.
|
|
||||||
|
|
||||||
**Architecture:** Fine enveloppe autour du shell `internal/CalendarField.vue` (comme `MalioDate`). Le slot popover contient `MonthGrid` (jour) + un `<input type="time">` (heure) sous la grille. La valeur émise est l'ISO naïf `"YYYY-MM-DDTHH:MM:00"`. Logique de découpe/recomposition dans un nouveau composable `datetimeFormat.ts`.
|
|
||||||
|
|
||||||
**Tech Stack:** Vue 3 `<script setup lang="ts">`, TypeScript strict, Tailwind (`m-*`), `tailwind-merge`, Vitest + @vue/test-utils (jsdom).
|
|
||||||
|
|
||||||
**Conventions (rappel) :** Conventional Commits **avec espace avant `:`**, type minuscule, suffixe ticket `(#MUI-33)`, pas de préfixe `[#...]`. Terminer par `Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>`. Le hook pre-commit est flaky (timeouts WSL2) → après vérification ciblée `npx vitest run <chemin>`, committer avec `--no-verify`.
|
|
||||||
|
|
||||||
**Réfs spec :** `docs/superpowers/specs/2026-05-22-datetime-design.md`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 1 : Composable `datetimeFormat.ts`
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/components/malio/date/composables/datetimeFormat.ts`
|
|
||||||
- Test: `app/components/malio/date/composables/datetimeFormat.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire les tests qui échouent**
|
|
||||||
|
|
||||||
Créer `app/components/malio/date/composables/datetimeFormat.test.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {
|
|
||||||
composeDateTime,
|
|
||||||
formatIsoDateTimeToDisplay,
|
|
||||||
isValidIsoDateTime,
|
|
||||||
splitDateTime,
|
|
||||||
} from './datetimeFormat'
|
|
||||||
|
|
||||||
describe('datetimeFormat', () => {
|
|
||||||
describe('isValidIsoDateTime', () => {
|
|
||||||
it('accepte un datetime ISO complet valide', () => {
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30:00')).toBe(true)
|
|
||||||
expect(isValidIsoDateTime('2026-01-01T00:00:00')).toBe(true)
|
|
||||||
expect(isValidIsoDateTime('2026-12-31T23:59:59')).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('rejette une date seule, des composants invalides ou une chaîne vide', () => {
|
|
||||||
expect(isValidIsoDateTime('2026-05-20')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-13-01T00:00:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T24:00:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:60:00')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30:60')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('2026-05-20T14:30')).toBe(false)
|
|
||||||
expect(isValidIsoDateTime('')).toBe(false)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('formatIsoDateTimeToDisplay', () => {
|
|
||||||
it('formate un datetime valide en JJ/MM/AAAA HH:MM', () => {
|
|
||||||
expect(formatIsoDateTimeToDisplay('2026-05-20T14:30:00')).toBe('20/05/2026 14:30')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renvoie une chaîne vide pour nul ou invalide', () => {
|
|
||||||
expect(formatIsoDateTimeToDisplay(null)).toBe('')
|
|
||||||
expect(formatIsoDateTimeToDisplay('2026-05-20')).toBe('')
|
|
||||||
expect(formatIsoDateTimeToDisplay('nope')).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('splitDateTime', () => {
|
|
||||||
it('découpe un datetime valide', () => {
|
|
||||||
expect(splitDateTime('2026-05-20T14:30:00')).toEqual({date: '2026-05-20', time: '14:30'})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renvoie date null et time vide pour nul, date seule ou invalide', () => {
|
|
||||||
expect(splitDateTime(null)).toEqual({date: null, time: ''})
|
|
||||||
expect(splitDateTime('2026-05-20')).toEqual({date: null, time: ''})
|
|
||||||
expect(splitDateTime('nope')).toEqual({date: null, time: ''})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('composeDateTime', () => {
|
|
||||||
it('recompose un datetime ISO avec secondes à 00', () => {
|
|
||||||
expect(composeDateTime('2026-05-20', '14:30')).toBe('2026-05-20T14:30:00')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('utilise 00:00 quand l\\'heure est vide', () => {
|
|
||||||
expect(composeDateTime('2026-05-20', '')).toBe('2026-05-20T00:00:00')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer les tests pour vérifier qu'ils échouent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/date/composables/datetimeFormat.test.ts`
|
|
||||||
Expected: FAIL (module `./datetimeFormat` introuvable).
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Écrire l'implémentation**
|
|
||||||
|
|
||||||
Créer `app/components/malio/date/composables/datetimeFormat.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {isValidIso} from './dateFormat'
|
|
||||||
|
|
||||||
const DATETIME_RE = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2}):(\d{2})$/
|
|
||||||
|
|
||||||
export function isValidIsoDateTime(s: string): boolean {
|
|
||||||
const m = DATETIME_RE.exec(s)
|
|
||||||
if (!m) return false
|
|
||||||
const [, date, hh, mm, ss] = m
|
|
||||||
if (!isValidIso(date)) return false
|
|
||||||
const h = Number(hh)
|
|
||||||
const min = Number(mm)
|
|
||||||
const sec = Number(ss)
|
|
||||||
return h >= 0 && h <= 23 && min >= 0 && min <= 59 && sec >= 0 && sec <= 59
|
|
||||||
}
|
|
||||||
|
|
||||||
export function formatIsoDateTimeToDisplay(s: string | null): string {
|
|
||||||
if (!s || !isValidIsoDateTime(s)) return ''
|
|
||||||
const [date, time] = s.split('T')
|
|
||||||
const [y, mo, d] = date.split('-')
|
|
||||||
const [hh, mm] = time.split(':')
|
|
||||||
return `${d}/${mo}/${y} ${hh}:${mm}`
|
|
||||||
}
|
|
||||||
|
|
||||||
export function splitDateTime(s: string | null): {date: string | null; time: string} {
|
|
||||||
if (!s || !isValidIsoDateTime(s)) return {date: null, time: ''}
|
|
||||||
const [date, time] = s.split('T')
|
|
||||||
return {date, time: time.slice(0, 5)}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function composeDateTime(date: string, time: string): string {
|
|
||||||
const t = time || '00:00'
|
|
||||||
return `${date}T${t}:00`
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Lancer les tests pour vérifier qu'ils passent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/date/composables/datetimeFormat.test.ts`
|
|
||||||
Expected: PASS (tous verts).
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/date/composables/datetimeFormat.ts app/components/malio/date/composables/datetimeFormat.test.ts
|
|
||||||
git commit --no-verify -m "feat : composable datetimeFormat pour MalioDateTime (#MUI-33)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 2 : Composant `DateTime.vue`
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/components/malio/date/DateTime.vue`
|
|
||||||
- Test: `app/components/malio/date/DateTime.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire les tests qui échouent**
|
|
||||||
|
|
||||||
Créer `app/components/malio/date/DateTime.test.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import type {DefineComponent} from 'vue'
|
|
||||||
import DateTime_ from './DateTime.vue'
|
|
||||||
|
|
||||||
type DateTimeProps = {
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
min?: string
|
|
||||||
max?: string
|
|
||||||
clearable?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const DateTimeForTest = DateTime_ as DefineComponent<DateTimeProps>
|
|
||||||
const mountDateTime = (props: DateTimeProps = {}) =>
|
|
||||||
mount(DateTimeForTest, {props, attachTo: document.body})
|
|
||||||
|
|
||||||
describe('MalioDateTime', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.useFakeTimers()
|
|
||||||
vi.setSystemTime(new Date(2026, 4, 19)) // 19 mai 2026
|
|
||||||
})
|
|
||||||
afterEach(() => vi.useRealTimers())
|
|
||||||
|
|
||||||
describe('rendu', () => {
|
|
||||||
it('affiche le label et l\\'icône calendrier', () => {
|
|
||||||
const wrapper = mountDateTime({label: 'Rendez-vous'})
|
|
||||||
expect(wrapper.get('label').text()).toBe('Rendez-vous')
|
|
||||||
expect(wrapper.find('[data-test="calendar-icon"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('affiche la valeur formatée date + heure dans le champ', () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]').element as HTMLInputElement
|
|
||||||
expect(input.value).toBe('20/05/2026 14:30')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('popover', () => {
|
|
||||||
it('ouvre la grille et l\\'input heure au clic', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
expect(wrapper.find('[data-test="month-grid"]').exists()).toBe(true)
|
|
||||||
expect(wrapper.find('[data-test="time-input"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('sélection', () => {
|
|
||||||
it('émet le jour à 00:00 et garde le popover ouvert', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
await wrapper.get('[data-test="day"][data-iso="2026-05-19"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-19T00:00:00'])
|
|
||||||
expect(wrapper.find('[data-test="popover"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applique l\\'heure réglée avant le clic du jour', async () => {
|
|
||||||
const wrapper = mountDateTime()
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
const time = wrapper.get('[data-test="time-input"]')
|
|
||||||
;(time.element as HTMLInputElement).value = '09:15'
|
|
||||||
await time.trigger('input')
|
|
||||||
// pas d'émission tant qu'aucun jour n'est choisi
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
await wrapper.get('[data-test="day"][data-iso="2026-05-19"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-19T09:15:00'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('met à jour l\\'heure quand une date est déjà choisie', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
const time = wrapper.get('[data-test="time-input"]')
|
|
||||||
;(time.element as HTMLInputElement).value = '08:45'
|
|
||||||
await time.trigger('input')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual(['2026-05-20T08:45:00'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('initialise l\\'input heure depuis la valeur', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
const time = wrapper.get('[data-test="time-input"]').element as HTMLInputElement
|
|
||||||
expect(time.value).toBe('14:30')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('bornes min/max', () => {
|
|
||||||
it('désactive les jours hors bornes (datetime borné sur la date)', async () => {
|
|
||||||
const wrapper = mountDateTime({min: '2026-05-10T00:00:00', max: '2026-05-20T00:00:00'})
|
|
||||||
await wrapper.get('[data-test="date-input"]').trigger('click')
|
|
||||||
const outside = wrapper.get('[data-test="day"][data-iso="2026-05-05"]')
|
|
||||||
expect((outside.element as HTMLButtonElement).disabled).toBe(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('effacement', () => {
|
|
||||||
it('émet null au clic sur la croix', async () => {
|
|
||||||
const wrapper = mountDateTime({modelValue: '2026-05-20T14:30:00'})
|
|
||||||
await wrapper.get('[data-test="clear"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([null])
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
describe('accessibilité', () => {
|
|
||||||
it('positionne aria-invalid et describedby sur erreur', () => {
|
|
||||||
const wrapper = mountDateTime({error: 'Date requise'})
|
|
||||||
const input = wrapper.get('[data-test="date-input"]')
|
|
||||||
expect(input.attributes('aria-invalid')).toBe('true')
|
|
||||||
expect(input.attributes('aria-describedby')).toBeTruthy()
|
|
||||||
expect(wrapper.text()).toContain('Date requise')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer les tests pour vérifier qu'ils échouent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/date/DateTime.test.ts`
|
|
||||||
Expected: FAIL (`DateTime.vue` introuvable).
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Écrire l'implémentation**
|
|
||||||
|
|
||||||
Créer `app/components/malio/date/DateTime.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<template>
|
|
||||||
<CalendarField
|
|
||||||
:id="id"
|
|
||||||
:display-value="displayValue"
|
|
||||||
:sync-to="datePart"
|
|
||||||
:name="name"
|
|
||||||
:label="label"
|
|
||||||
:placeholder="placeholder"
|
|
||||||
:required="required"
|
|
||||||
:disabled="disabled"
|
|
||||||
:readonly="readonly"
|
|
||||||
:hint="hint"
|
|
||||||
:error="error"
|
|
||||||
:success="success"
|
|
||||||
:clearable="clearable"
|
|
||||||
:input-class="inputClass"
|
|
||||||
:label-class="labelClass"
|
|
||||||
:group-class="groupClass"
|
|
||||||
v-bind="$attrs"
|
|
||||||
@clear="onClear"
|
|
||||||
>
|
|
||||||
<template #default="{ currentMonth, currentYear }">
|
|
||||||
<MonthGrid
|
|
||||||
:month="currentMonth"
|
|
||||||
:year="currentYear"
|
|
||||||
:selected-date="datePart"
|
|
||||||
:min="min?.slice(0, 10)"
|
|
||||||
:max="max?.slice(0, 10)"
|
|
||||||
@select="onSelectDay"
|
|
||||||
/>
|
|
||||||
<!-- Bloc heure intérimaire : input natif, isolé pour remplacement futur par le sélecteur dédié. -->
|
|
||||||
<div class="mt-[10px] flex items-center gap-2 border-t border-m-muted/30 pt-[10px]">
|
|
||||||
<label
|
|
||||||
:for="timeInputId"
|
|
||||||
class="text-sm font-medium text-m-muted"
|
|
||||||
>
|
|
||||||
Heure
|
|
||||||
</label>
|
|
||||||
<input
|
|
||||||
:id="timeInputId"
|
|
||||||
data-test="time-input"
|
|
||||||
type="time"
|
|
||||||
:value="timeValue"
|
|
||||||
class="rounded-md border border-m-muted bg-white px-2 py-1 text-base outline-none focus:border-m-primary"
|
|
||||||
@input="onTimeInput"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</CalendarField>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, ref, useId, watch} from 'vue'
|
|
||||||
import CalendarField from './internal/CalendarField.vue'
|
|
||||||
import MonthGrid from './internal/MonthGrid.vue'
|
|
||||||
import {composeDateTime, formatIsoDateTimeToDisplay, isValidIsoDateTime, splitDateTime} from './composables/datetimeFormat'
|
|
||||||
|
|
||||||
defineOptions({name: 'MalioDateTime', inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue?: string | null
|
|
||||||
placeholder?: string
|
|
||||||
required?: boolean
|
|
||||||
disabled?: boolean
|
|
||||||
readonly?: boolean
|
|
||||||
hint?: string
|
|
||||||
error?: string
|
|
||||||
success?: string
|
|
||||||
min?: string
|
|
||||||
max?: string
|
|
||||||
clearable?: boolean
|
|
||||||
inputClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
id: '',
|
|
||||||
name: '',
|
|
||||||
label: '',
|
|
||||||
modelValue: undefined,
|
|
||||||
placeholder: 'JJ/MM/AAAA HH:MM',
|
|
||||||
required: false,
|
|
||||||
disabled: false,
|
|
||||||
readonly: false,
|
|
||||||
hint: '',
|
|
||||||
error: '',
|
|
||||||
success: '',
|
|
||||||
min: undefined,
|
|
||||||
max: undefined,
|
|
||||||
clearable: true,
|
|
||||||
inputClass: '',
|
|
||||||
labelClass: '',
|
|
||||||
groupClass: '',
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{(e: 'update:modelValue', value: string | null): void}>()
|
|
||||||
|
|
||||||
const generatedId = useId()
|
|
||||||
const timeInputId = computed(() => `${props.id || `malio-datetime-${generatedId}`}-time`)
|
|
||||||
|
|
||||||
// pendingTime : heure réglée avant qu'un jour ne soit choisi (sinon on ne peut pas émettre).
|
|
||||||
const pendingTime = ref('')
|
|
||||||
|
|
||||||
const parts = computed(() => splitDateTime(props.modelValue ?? null))
|
|
||||||
const datePart = computed(() => parts.value.date)
|
|
||||||
const displayValue = computed(() => formatIsoDateTimeToDisplay(props.modelValue ?? null))
|
|
||||||
const timeValue = computed(() => parts.value.time || pendingTime.value)
|
|
||||||
|
|
||||||
function onSelectDay(iso: string) {
|
|
||||||
const time = parts.value.time || pendingTime.value || '00:00'
|
|
||||||
emit('update:modelValue', composeDateTime(iso, time))
|
|
||||||
}
|
|
||||||
|
|
||||||
function onTimeInput(e: Event) {
|
|
||||||
const value = (e.target as HTMLInputElement).value
|
|
||||||
if (!value) return
|
|
||||||
if (datePart.value) {
|
|
||||||
emit('update:modelValue', composeDateTime(datePart.value, value))
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
pendingTime.value = value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClear() {
|
|
||||||
pendingTime.value = ''
|
|
||||||
emit('update:modelValue', null)
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(() => props.modelValue, (val) => {
|
|
||||||
if (val && !isValidIsoDateTime(val) && import.meta.dev) {
|
|
||||||
console.warn(`[MalioDateTime] modelValue invalide ignoré : "${val}"`)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Lancer les tests pour vérifier qu'ils passent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/date/DateTime.test.ts`
|
|
||||||
Expected: PASS (tous verts).
|
|
||||||
|
|
||||||
Note : si `@input` ne déclenche pas `value` correctement en jsdom, utiliser `await time.setValue('09:15')` à la place du couple `.value =` + `.trigger('input')` dans les tests.
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/date/DateTime.vue app/components/malio/date/DateTime.test.ts
|
|
||||||
git commit --no-verify -m "feat : composant MalioDateTime (date + heure) (#MUI-33)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 3 : Page playground + entrée nav
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `.playground/pages/composant/date/datetime.vue`
|
|
||||||
- Modify: `.playground/playground.nav.ts` (section `DATES & HEURES`)
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Créer la page playground**
|
|
||||||
|
|
||||||
Créer `.playground/pages/composant/date/datetime.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<template>
|
|
||||||
<div class="space-y-6 p-4">
|
|
||||||
<h1 class="text-2xl font-bold">MalioDateTime</h1>
|
|
||||||
|
|
||||||
<div class="flex flex-wrap items-start gap-10">
|
|
||||||
<div class="w-[396px] space-y-3">
|
|
||||||
<h2 class="font-semibold">Simple</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="value"
|
|
||||||
label="Date et heure du rendez-vous"
|
|
||||||
hint="Choisis un jour puis une heure"
|
|
||||||
/>
|
|
||||||
<div class="rounded border p-3 text-sm">
|
|
||||||
<p>Valeur (ISO naïf) : <code>{{ value ?? 'null' }}</code></p>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="rounded border px-3 py-1.5"
|
|
||||||
@click="value = null"
|
|
||||||
>
|
|
||||||
Réinitialiser
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="w-[396px] space-y-3">
|
|
||||||
<h2 class="font-semibold">Valeur initiale + bornes</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="bounded"
|
|
||||||
label="Créneau"
|
|
||||||
:min="todayIso"
|
|
||||||
:max="maxIso"
|
|
||||||
hint="Entre aujourd'hui et +30 jours"
|
|
||||||
/>
|
|
||||||
<div class="rounded border p-3 text-sm">
|
|
||||||
<p>Valeur (ISO naïf) : <code>{{ bounded ?? 'null' }}</code></p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
|
|
||||||
const pad = (n: number) => String(n).padStart(2, '0')
|
|
||||||
const toIso = (d: Date) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T00:00:00`
|
|
||||||
const now = new Date()
|
|
||||||
const todayIso = toIso(now)
|
|
||||||
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
|
||||||
|
|
||||||
const value = ref<string | null>(null)
|
|
||||||
const bounded = ref<string | null>('2026-05-20T14:30:00')
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Ajouter l'entrée nav**
|
|
||||||
|
|
||||||
Dans `.playground/playground.nav.ts`, section `DATES & HEURES`, ajouter l'item après `Semaine` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
{label: 'Date & heure', to: '/composant/date/datetime'},
|
|
||||||
```
|
|
||||||
|
|
||||||
Le bloc devient :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
items: [
|
|
||||||
{label: 'Date', to: '/composant/date/date'},
|
|
||||||
{label: 'Plage de dates', to: '/composant/date/dateRange'},
|
|
||||||
{label: 'Semaine', to: '/composant/date/dateWeek'},
|
|
||||||
{label: 'Date & heure', to: '/composant/date/datetime'},
|
|
||||||
{label: 'Heure', to: '/composant/time/time'},
|
|
||||||
],
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Vérifier le lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: PASS (pas d'erreur sur les fichiers playground).
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add .playground/pages/composant/date/datetime.vue .playground/playground.nav.ts
|
|
||||||
git commit --no-verify -m "feat : page playground MalioDateTime (#MUI-33)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 4 : Story Histoire
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/story/date/dateTime.story.vue`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Créer la story**
|
|
||||||
|
|
||||||
Créer `app/story/date/dateTime.story.vue` (nom de fichier camelCase pour éviter `vue/multi-word-component-names`) :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<template>
|
|
||||||
<Story title="Date/DateTime">
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Simple</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="simpleValue"
|
|
||||||
label="Date et heure"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Valeur initiale</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Rendez-vous"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Avec min/max</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="boundedValue"
|
|
||||||
label="Créneau"
|
|
||||||
:min="todayIso"
|
|
||||||
:max="maxIso"
|
|
||||||
hint="Entre aujourd'hui et +30 jours"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Erreur</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="errorValue"
|
|
||||||
label="Date limite"
|
|
||||||
error="Date et heure requises"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Désactivé</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Désactivé"
|
|
||||||
disabled
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-4">
|
|
||||||
<h2 class="mb-4 text-xl font-bold">Lecture seule</h2>
|
|
||||||
<MalioDateTime
|
|
||||||
v-model="initialValue"
|
|
||||||
label="Lecture seule"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {ref} from 'vue'
|
|
||||||
import MalioDateTime from '../../components/malio/date/DateTime.vue'
|
|
||||||
|
|
||||||
const pad = (n: number) => String(n).padStart(2, '0')
|
|
||||||
const toIso = (d: Date) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T00:00:00`
|
|
||||||
|
|
||||||
const now = new Date()
|
|
||||||
const todayIso = toIso(now)
|
|
||||||
const maxIso = toIso(new Date(now.getTime() + 30 * 86400000))
|
|
||||||
|
|
||||||
const simpleValue = ref<string | null>(null)
|
|
||||||
const initialValue = ref<string | null>('2026-05-20T14:30:00')
|
|
||||||
const boundedValue = ref<string | null>(null)
|
|
||||||
const errorValue = ref<string | null>(null)
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Vérifier le lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: PASS.
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/story/date/dateTime.story.vue
|
|
||||||
git commit --no-verify -m "docs : story Histoire pour MalioDateTime (#MUI-33)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 5 : Documentation (COMPONENTS.md + CHANGELOG.md)
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `COMPONENTS.md`
|
|
||||||
- Modify: `CHANGELOG.md`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Ajouter la section dans COMPONENTS.md**
|
|
||||||
|
|
||||||
Ouvrir `COMPONENTS.md`, repérer la section `MalioDate` (ou la famille date) et ajouter une section `MalioDateTime` calquée dessus, documentant :
|
|
||||||
- Description : champ unique date + heure, popover (grille + sélecteur d'heure), version intérimaire avec `<input type="time">` natif.
|
|
||||||
- `modelValue` : `string | null`, format `"YYYY-MM-DDTHH:MM:00"` (ISO naïf sans fuseau ; Symfony applique son fuseau).
|
|
||||||
- Table des props identique à `MalioDate` (ajouter la note sur `min`/`max` bornant la date).
|
|
||||||
- Émission `update:modelValue`.
|
|
||||||
- Exemple d'usage :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioDateTime v-model="rdv" label="Date et heure du rendez-vous" />
|
|
||||||
<!-- rdv === "2026-05-20T14:30:00" -->
|
|
||||||
```
|
|
||||||
|
|
||||||
- Note : le sélecteur d'heure est intérimaire et sera remplacé par un composant dédié (maquette à venir).
|
|
||||||
|
|
||||||
Respecter le style et la structure exacts des sections existantes (titres, tableaux markdown).
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Ajouter l'entrée CHANGELOG.md**
|
|
||||||
|
|
||||||
Dans `CHANGELOG.md`, sous `## [0.0.0]` → `### Added`, ajouter après la ligne `[#MUI-33] Développer le composant Datepicker` :
|
|
||||||
|
|
||||||
```
|
|
||||||
* [#MUI-33] Création du composant DateTime (date + heure, sélecteur d'heure natif intérimaire)
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add COMPONENTS.md CHANGELOG.md
|
|
||||||
git commit --no-verify -m "docs : documente MalioDateTime (COMPONENTS + CHANGELOG) (#MUI-33)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Vérification finale
|
|
||||||
|
|
||||||
- [ ] `npx vitest run app/components/malio/date/` → toute la famille date verte.
|
|
||||||
- [ ] `npm run lint` → pas d'erreur.
|
|
||||||
- [ ] Revue finale du composant (cohérence avec la famille date, isolation du bloc heure pour remplacement futur).
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,979 +0,0 @@
|
|||||||
# MalioModal Implementation Plan
|
|
||||||
|
|
||||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
|
||||||
|
|
||||||
**Goal:** Ajouter un composant `MalioModal` (dialogue modal centré) autonome à `@malio/layer-ui`, sans modifier le Drawer existant.
|
|
||||||
|
|
||||||
**Architecture:** Composant Vue SFC unique `app/components/malio/modal/Modal.vue`, auto-importé comme `<MalioModal>`. Réimplémente sa propre logique (Teleport, focus-trap, scroll-lock partagé via compteur module-level, pattern contrôlé/non-contrôlé, transition fade+scale) en s'inspirant du Drawer. Structure : header fixe / body scrollable / footer fixe.
|
|
||||||
|
|
||||||
**Tech Stack:** Nuxt 4 layer, Vue 3 `<script setup lang="ts">`, Tailwind (tokens `m-*`), `tailwind-merge`, `@iconify/vue`, Vitest + `@vue/test-utils` (jsdom), Histoire.
|
|
||||||
|
|
||||||
**Spec:** `docs/superpowers/specs/2026-05-26-modal-design.md`
|
|
||||||
|
|
||||||
**Conventions projet à respecter :**
|
|
||||||
- Commits Conventional **avec espace avant les `:`** : `feat : … (#MUI-36)`, `docs : …`, `test : …`. Type en minuscules, pas de préfixe `[#…]`. Finir par la ligne `Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>`.
|
|
||||||
- Le hook pre-commit lance lint + ~595 tests et **time out de façon flaky** sous WSL2. Pattern : réessayer ; après 2 échecs flaky (échecs différents d'un run à l'autre), vérifier les tests ciblés à la main (`npx vitest run <chemin>`) puis committer avec `--no-verify`.
|
|
||||||
- Story : nom de fichier sous un dossier (`story/modal/modal.story.vue`) ; `defineOptions({ name: 'ModalStory' })` pour éviter `vue/multi-word-component-names`.
|
|
||||||
|
|
||||||
**File Structure:**
|
|
||||||
- Create `app/components/malio/modal/Modal.vue` — le composant (≈ taille du Drawer).
|
|
||||||
- Create `app/components/malio/modal/Modal.test.ts` — tests colocalisés.
|
|
||||||
- Create `.playground/pages/composant/modal/modal.vue` — page de démo (route `/composant/modal/modal`).
|
|
||||||
- Modify `.playground/playground.nav.ts` — ajout de l'entrée nav dans la section `NAVIGATION`.
|
|
||||||
- Create `app/story/modal/modal.story.vue` — story Histoire.
|
|
||||||
- Modify `COMPONENTS.md` — section `## MalioModal` (insérée après la section `## MalioDrawer`).
|
|
||||||
- Modify `CHANGELOG.md` — ligne sous `### Added`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 1: Composant MalioModal + suite de tests (cycle TDD)
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/components/malio/modal/Modal.test.ts`
|
|
||||||
- Create: `app/components/malio/modal/Modal.vue`
|
|
||||||
|
|
||||||
- [ ] **Step 1: Écrire la suite de tests qui échoue**
|
|
||||||
|
|
||||||
Create `app/components/malio/modal/Modal.test.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import { afterEach, describe, expect, it } from 'vitest'
|
|
||||||
import { enableAutoUnmount, mount } from '@vue/test-utils'
|
|
||||||
import type { DefineComponent } from 'vue'
|
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
|
||||||
import Modal from './Modal.vue'
|
|
||||||
|
|
||||||
type ModalProps = {
|
|
||||||
id?: string
|
|
||||||
modelValue?: boolean
|
|
||||||
showClose?: boolean
|
|
||||||
dismissable?: boolean
|
|
||||||
closeOnEscape?: boolean
|
|
||||||
ariaLabel?: string
|
|
||||||
modalClass?: string
|
|
||||||
overlayClass?: string
|
|
||||||
headerClass?: string
|
|
||||||
bodyClass?: string
|
|
||||||
footerClass?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const ModalForTest = Modal as DefineComponent<ModalProps>
|
|
||||||
|
|
||||||
function mountComponent(props: ModalProps = {}, slots?: Record<string, string>) {
|
|
||||||
return mount(ModalForTest, {
|
|
||||||
props,
|
|
||||||
slots,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('MalioModal', () => {
|
|
||||||
enableAutoUnmount(afterEach)
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render when modelValue is false', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: false })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the panel when modelValue is true', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('centers the modal (items-center justify-center)', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const root = wrapper.find('.fixed')
|
|
||||||
expect(root.classes()).toContain('items-center')
|
|
||||||
expect(root.classes()).toContain('justify-center')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders default slot in the body', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ default: '<p data-test="content">Contenu</p>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="body"] [data-test="content"]').text()).toBe('Contenu')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('works in uncontrolled mode (defaults closed)', () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
expect(wrapper.find('[data-test="panel"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('uses custom id when provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, id: 'my-modal' })
|
|
||||||
expect(wrapper.find('.fixed').attributes('id')).toBe('my-modal')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('generates an id when not provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('.fixed').attributes('id')).toMatch(/^malio-modal-/)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('has role="dialog" and aria-modal on the panel', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('role')).toBe('dialog')
|
|
||||||
expect(panel.attributes('aria-modal')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies modalClass to the panel', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, modalClass: 'max-w-2xl' })
|
|
||||||
expect(wrapper.find('[data-test="panel"]').classes()).toContain('max-w-2xl')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the #header slot inside the header bar', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ header: '<h2 data-test="title">Titre</h2>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="header"] [data-test="title"]').text()).toBe('Titre')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the header bar when showClose is true even without #header', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="header"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render the header bar when no #header and showClose is false', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, showClose: false })
|
|
||||||
expect(wrapper.find('[data-test="header"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows the close button by default', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('hides the close button when showClose is false', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, showClose: false },
|
|
||||||
{ header: '<h2>Titre</h2>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('close button renders mdi:cancel-bold icon', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
const icon = wrapper.findComponent(IconifyIcon)
|
|
||||||
expect(icon.props('icon')).toBe('mdi:cancel-bold')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('close button has aria-label "Fermer"', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="close-button"]').attributes('aria-label')).toBe('Fermer')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue false and close on close button click', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="close-button"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets aria-labelledby to the header id when #header is provided', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, id: 'test-modal' },
|
|
||||||
{ header: '<h2>Titre</h2>' },
|
|
||||||
)
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('aria-labelledby')).toBe('test-modal-header')
|
|
||||||
expect(wrapper.find('[data-test="header-content"]').attributes('id')).toBe('test-modal-header')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('sets aria-label from ariaLabel when no #header is provided', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, ariaLabel: 'Boîte de dialogue' })
|
|
||||||
const panel = wrapper.find('[data-test="panel"]')
|
|
||||||
expect(panel.attributes('aria-label')).toBe('Boîte de dialogue')
|
|
||||||
expect(panel.attributes('aria-labelledby')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies headerClass to the header bar', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, headerClass: 'bg-m-primary' })
|
|
||||||
expect(wrapper.find('[data-test="header"]').classes()).toContain('bg-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('renders the #footer slot in a footer pinned below the body', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true },
|
|
||||||
{ footer: '<button data-test="save">Enregistrer</button>' },
|
|
||||||
)
|
|
||||||
// le footer n'est PAS dans la zone scrollable (≠ Drawer)
|
|
||||||
expect(wrapper.find('[data-test="body"] [data-test="footer"]').exists()).toBe(false)
|
|
||||||
expect(wrapper.find('[data-test="footer"] [data-test="save"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not render the footer when no #footer slot', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
expect(wrapper.find('[data-test="footer"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies bodyClass to the body', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, bodyClass: 'px-10' })
|
|
||||||
expect(wrapper.find('[data-test="body"]').classes()).toContain('px-10')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies footerClass to the footer', () => {
|
|
||||||
const wrapper = mountComponent(
|
|
||||||
{ modelValue: true, footerClass: 'justify-end' },
|
|
||||||
{ footer: '<span>pied</span>' },
|
|
||||||
)
|
|
||||||
expect(wrapper.find('[data-test="footer"]').classes()).toContain('justify-end')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('emits update:modelValue false and close on backdrop click (dismissable)', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="backdrop"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not close on backdrop click when dismissable is false', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, dismissable: false })
|
|
||||||
await wrapper.find('[data-test="backdrop"]').trigger('click')
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('applies overlayClass to the backdrop', () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, overlayClass: 'bg-black/70' })
|
|
||||||
expect(wrapper.find('[data-test="backdrop"]').classes()).toContain('bg-black/70')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('closes on Escape key when closeOnEscape is true', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true })
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Escape' })
|
|
||||||
expect(wrapper.emitted('update:modelValue')?.[0]).toEqual([false])
|
|
||||||
expect(wrapper.emitted('close')).toHaveLength(1)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not close on Escape when closeOnEscape is false', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: true, closeOnEscape: false })
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Escape' })
|
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('locks body scroll when opened and restores it when closed', async () => {
|
|
||||||
const wrapper = mountComponent({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
await wrapper.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('moves focus into the panel when opened', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false, showClose: false },
|
|
||||||
slots: { default: '<button data-test="first">OK</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const first = wrapper.find('[data-test="first"]').element
|
|
||||||
expect(document.activeElement).toBe(first)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('restores focus to the trigger when closed', async () => {
|
|
||||||
const trigger = document.createElement('button')
|
|
||||||
document.body.appendChild(trigger)
|
|
||||||
trigger.focus()
|
|
||||||
expect(document.activeElement).toBe(trigger)
|
|
||||||
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
slots: { default: '<button>OK</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.setProps({ modelValue: true })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
await wrapper.setProps({ modelValue: false })
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
expect(document.activeElement).toBe(trigger)
|
|
||||||
|
|
||||||
wrapper.unmount()
|
|
||||||
trigger.remove()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wraps focus to the first element when Tab is pressed on the last element', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: true, showClose: false },
|
|
||||||
slots: { default: '<button data-test="btn1">First</button><button data-test="btn2">Last</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const last = wrapper.find('[data-test="btn2"]').element as HTMLElement
|
|
||||||
last.focus()
|
|
||||||
expect(document.activeElement).toBe(last)
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Tab' })
|
|
||||||
expect(document.activeElement).toBe(wrapper.find('[data-test="btn1"]').element)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('wraps focus to the last element when Shift+Tab is pressed on the first element', async () => {
|
|
||||||
const wrapper = mount(ModalForTest, {
|
|
||||||
props: { modelValue: true, showClose: false },
|
|
||||||
slots: { default: '<button data-test="btn1">First</button><button data-test="btn2">Last</button>' },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
await wrapper.vm.$nextTick()
|
|
||||||
const first = wrapper.find('[data-test="btn1"]').element as HTMLElement
|
|
||||||
first.focus()
|
|
||||||
expect(document.activeElement).toBe(first)
|
|
||||||
await wrapper.find('[data-test="panel"]').trigger('keydown', { key: 'Tab', shiftKey: true })
|
|
||||||
expect(document.activeElement).toBe(wrapper.find('[data-test="btn2"]').element)
|
|
||||||
wrapper.unmount()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('does not release body scroll-lock when one stacked modal closes while another is still open', async () => {
|
|
||||||
const wrapperA = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
const wrapperB = mount(ModalForTest, {
|
|
||||||
props: { modelValue: false },
|
|
||||||
attachTo: document.body,
|
|
||||||
global: { stubs: { Teleport: true } },
|
|
||||||
})
|
|
||||||
|
|
||||||
await wrapperA.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperB.setProps({ modelValue: true })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperB.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('hidden')
|
|
||||||
|
|
||||||
await wrapperA.setProps({ modelValue: false })
|
|
||||||
expect(document.body.style.overflow).toBe('')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2: Lancer les tests pour vérifier qu'ils échouent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/modal/Modal.test.ts`
|
|
||||||
Expected: FAIL — `Failed to resolve import "./Modal.vue"` (le composant n'existe pas encore).
|
|
||||||
|
|
||||||
- [ ] **Step 3: Implémenter le composant**
|
|
||||||
|
|
||||||
Create `app/components/malio/modal/Modal.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<template>
|
|
||||||
<Teleport to="body">
|
|
||||||
<Transition
|
|
||||||
name="modal"
|
|
||||||
appear
|
|
||||||
@after-leave="isRendered = false"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="isRendered && isOpen"
|
|
||||||
:id="componentId"
|
|
||||||
class="fixed inset-0 z-50 flex items-center justify-center p-4"
|
|
||||||
v-bind="attrs"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
:class="twMerge('absolute inset-0 bg-black/40', overlayClass)"
|
|
||||||
data-test="backdrop"
|
|
||||||
@click="onBackdropClick"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div
|
|
||||||
ref="panelRef"
|
|
||||||
:class="twMerge(
|
|
||||||
'relative z-50 flex max-h-[85vh] w-full max-w-md flex-col rounded-malio bg-white',
|
|
||||||
modalClass,
|
|
||||||
)"
|
|
||||||
role="dialog"
|
|
||||||
aria-modal="true"
|
|
||||||
:aria-labelledby="hasHeader ? headerId : undefined"
|
|
||||||
:aria-label="hasHeader ? undefined : (ariaLabel || undefined)"
|
|
||||||
tabindex="-1"
|
|
||||||
data-test="panel"
|
|
||||||
@keydown="onKeydown"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="hasHeader || showClose"
|
|
||||||
:class="twMerge('flex shrink-0 items-center justify-between gap-4 px-5 py-[25px]', headerClass)"
|
|
||||||
data-test="header"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
:id="headerId"
|
|
||||||
class="min-w-0 flex-1"
|
|
||||||
data-test="header-content"
|
|
||||||
>
|
|
||||||
<slot name="header" />
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
v-if="showClose"
|
|
||||||
type="button"
|
|
||||||
aria-label="Fermer"
|
|
||||||
class="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full transition-colors hover:bg-m-surface"
|
|
||||||
data-test="close-button"
|
|
||||||
@click="close"
|
|
||||||
>
|
|
||||||
<IconifyIcon
|
|
||||||
icon="mdi:cancel-bold"
|
|
||||||
:width="16"
|
|
||||||
:height="16"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
:class="twMerge('flex-1 overflow-y-auto px-5', bodyClass)"
|
|
||||||
data-test="body"
|
|
||||||
>
|
|
||||||
<slot />
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="$slots.footer"
|
|
||||||
:class="twMerge('flex shrink-0 items-center gap-3 border-t border-m-border px-5 py-4', footerClass)"
|
|
||||||
data-test="footer"
|
|
||||||
>
|
|
||||||
<slot name="footer" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Transition>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {
|
|
||||||
computed,
|
|
||||||
nextTick,
|
|
||||||
onBeforeUnmount,
|
|
||||||
onMounted,
|
|
||||||
ref,
|
|
||||||
useAttrs,
|
|
||||||
useId,
|
|
||||||
useSlots,
|
|
||||||
watch,
|
|
||||||
} from 'vue'
|
|
||||||
import { Icon as IconifyIcon } from '@iconify/vue'
|
|
||||||
import { twMerge } from 'tailwind-merge'
|
|
||||||
|
|
||||||
defineOptions({ name: 'MalioModal', inheritAttrs: false })
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
modelValue?: boolean
|
|
||||||
showClose?: boolean
|
|
||||||
dismissable?: boolean
|
|
||||||
closeOnEscape?: boolean
|
|
||||||
ariaLabel?: string
|
|
||||||
modalClass?: string
|
|
||||||
overlayClass?: string
|
|
||||||
headerClass?: string
|
|
||||||
bodyClass?: string
|
|
||||||
footerClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
id: '',
|
|
||||||
modelValue: undefined,
|
|
||||||
showClose: true,
|
|
||||||
dismissable: true,
|
|
||||||
closeOnEscape: true,
|
|
||||||
ariaLabel: '',
|
|
||||||
modalClass: '',
|
|
||||||
overlayClass: '',
|
|
||||||
headerClass: '',
|
|
||||||
bodyClass: '',
|
|
||||||
footerClass: '',
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(e: 'update:modelValue', value: boolean): void
|
|
||||||
(e: 'close'): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const attrs = useAttrs()
|
|
||||||
const generatedId = useId()
|
|
||||||
|
|
||||||
const componentId = computed(() => props.id || `malio-modal-${generatedId}`)
|
|
||||||
|
|
||||||
const slots = useSlots()
|
|
||||||
const headerId = computed(() => `${componentId.value}-header`)
|
|
||||||
const hasHeader = computed(() => !!slots.header)
|
|
||||||
|
|
||||||
const isControlled = computed(() => props.modelValue !== undefined)
|
|
||||||
const localValue = ref(false)
|
|
||||||
const isOpen = computed(() =>
|
|
||||||
isControlled.value ? props.modelValue! : localValue.value,
|
|
||||||
)
|
|
||||||
const isRendered = ref(isOpen.value)
|
|
||||||
|
|
||||||
const panelRef = ref<HTMLElement | null>(null)
|
|
||||||
|
|
||||||
let previouslyFocused: HTMLElement | null = null
|
|
||||||
// Per-instance flag: true while this modal holds a scroll-lock count slot.
|
|
||||||
let lockedByThisInstance = false
|
|
||||||
|
|
||||||
function getFocusable(container: HTMLElement): HTMLElement[] {
|
|
||||||
return Array.from(
|
|
||||||
container.querySelectorAll<HTMLElement>(
|
|
||||||
'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"]), [contenteditable]:not([contenteditable="false"])',
|
|
||||||
),
|
|
||||||
).filter((el) => el.tabIndex !== -1)
|
|
||||||
}
|
|
||||||
|
|
||||||
function onOpen() {
|
|
||||||
previouslyFocused = (document.activeElement as HTMLElement | null) ?? null
|
|
||||||
if (!lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = true
|
|
||||||
openModalCount++
|
|
||||||
if (openModalCount === 1) {
|
|
||||||
document.body.style.overflow = 'hidden'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
nextTick(() => {
|
|
||||||
const panel = panelRef.value
|
|
||||||
if (!panel) return
|
|
||||||
const focusable = getFocusable(panel)
|
|
||||||
;(focusable[0] ?? panel).focus()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function onClose() {
|
|
||||||
if (lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = false
|
|
||||||
openModalCount = Math.max(0, openModalCount - 1)
|
|
||||||
if (openModalCount === 0) {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
previouslyFocused?.focus?.()
|
|
||||||
previouslyFocused = null
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(isOpen, (val) => {
|
|
||||||
if (val) {
|
|
||||||
isRendered.value = true
|
|
||||||
onOpen()
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
onClose()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
if (isOpen.value) onOpen()
|
|
||||||
})
|
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
|
||||||
// If this instance is still holding a scroll-lock slot, release it.
|
|
||||||
if (lockedByThisInstance) {
|
|
||||||
lockedByThisInstance = false
|
|
||||||
openModalCount = Math.max(0, openModalCount - 1)
|
|
||||||
if (openModalCount === 0) {
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
function onBackdropClick() {
|
|
||||||
if (props.dismissable) close()
|
|
||||||
}
|
|
||||||
|
|
||||||
function onKeydown(e: KeyboardEvent) {
|
|
||||||
if (e.key === 'Escape' && props.closeOnEscape) {
|
|
||||||
e.stopPropagation()
|
|
||||||
close()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (e.key !== 'Tab') return
|
|
||||||
|
|
||||||
const panel = panelRef.value
|
|
||||||
if (!panel) return
|
|
||||||
const focusable = getFocusable(panel)
|
|
||||||
if (focusable.length === 0) {
|
|
||||||
e.preventDefault()
|
|
||||||
panel.focus()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const first = focusable[0]!
|
|
||||||
const last = focusable[focusable.length - 1]!
|
|
||||||
if (e.shiftKey && document.activeElement === first) {
|
|
||||||
e.preventDefault()
|
|
||||||
last.focus()
|
|
||||||
}
|
|
||||||
else if (!e.shiftKey && document.activeElement === last) {
|
|
||||||
e.preventDefault()
|
|
||||||
first.focus()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function close() {
|
|
||||||
if (!isControlled.value) localValue.value = false
|
|
||||||
emit('update:modelValue', false)
|
|
||||||
emit('close')
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
// Shared across all MalioModal instances: only the last open modal releases the body scroll-lock.
|
|
||||||
let openModalCount = 0
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.modal-enter-active,
|
|
||||||
.modal-leave-active {
|
|
||||||
transition: opacity 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-active > div:last-child,
|
|
||||||
.modal-leave-active > div:last-child {
|
|
||||||
transition: transform 0.2s ease, opacity 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-from,
|
|
||||||
.modal-leave-to {
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modal-enter-from > div:last-child,
|
|
||||||
.modal-leave-to > div:last-child {
|
|
||||||
transform: scale(0.95);
|
|
||||||
opacity: 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4: Lancer les tests pour vérifier qu'ils passent**
|
|
||||||
|
|
||||||
Run: `npx vitest run app/components/malio/modal/Modal.test.ts`
|
|
||||||
Expected: PASS — tous les tests (≈ 32) verts.
|
|
||||||
|
|
||||||
- [ ] **Step 5: Lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: 0 erreur sur les fichiers du composant.
|
|
||||||
|
|
||||||
- [ ] **Step 6: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/modal/Modal.vue app/components/malio/modal/Modal.test.ts
|
|
||||||
git commit -m "feat : composant Modal (#MUI-36)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
(En cas de timeout flaky pre-commit, voir le pattern conventions en tête de plan : retry ×2 puis `--no-verify` après vérif ciblée `npx vitest run app/components/malio/modal/Modal.test.ts`.)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 2: Page playground + entrée nav
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `.playground/pages/composant/modal/modal.vue`
|
|
||||||
- Modify: `.playground/playground.nav.ts` (section `NAVIGATION`, après le Drawer)
|
|
||||||
|
|
||||||
- [ ] **Step 1: Créer la page de démo**
|
|
||||||
|
|
||||||
Create `.playground/pages/composant/modal/modal.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { ref } from 'vue'
|
|
||||||
|
|
||||||
const modalBase = ref(false)
|
|
||||||
const modalForm = ref(false)
|
|
||||||
const modalLong = ref(false)
|
|
||||||
const modalNoDismiss = ref(false)
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="grid grid-cols-1 items-start gap-6 md:grid-cols-2">
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Modal simple</h2>
|
|
||||||
<MalioButton label="Ouvrir" @click="modalBase = true" />
|
|
||||||
<MalioModal v-model="modalBase">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Détails</h2>
|
|
||||||
</template>
|
|
||||||
<p class="text-m-text">Contenu de la modal. Échap, clic backdrop et croix la ferment.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Avec footer d'actions</h2>
|
|
||||||
<MalioButton label="Ouvrir le formulaire" variant="tertiary" @click="modalForm = true" />
|
|
||||||
<MalioModal v-model="modalForm" modal-class="max-w-lg">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Nouveau contact</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4 py-2">
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<MalioInputText label="Prénom" />
|
|
||||||
<MalioInputText label="Email" />
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="modalForm = false" />
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="modalForm = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Contenu long (body scrollable)</h2>
|
|
||||||
<MalioButton label="Ouvrir" variant="tertiary" @click="modalLong = true" />
|
|
||||||
<MalioModal v-model="modalLong">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Conditions</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4">
|
|
||||||
<p v-for="n in 20" :key="n" class="text-m-text">
|
|
||||||
Paragraphe {{ n }} — contenu long pour forcer le scroll interne ; le header et le footer restent fixes.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Accepter" button-class="w-full" @click="modalLong = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="rounded-lg border p-6">
|
|
||||||
<h2 class="mb-6 text-xl font-bold">Non dismissable (croix uniquement)</h2>
|
|
||||||
<MalioButton label="Ouvrir" variant="danger" @click="modalNoDismiss = true" />
|
|
||||||
<MalioModal v-model="modalNoDismiss" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold text-black">Action requise</h2>
|
|
||||||
</template>
|
|
||||||
<p class="text-m-text">Ni le backdrop ni Échap ne ferment cette modal. Utilisez la croix.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2: Ajouter l'entrée nav**
|
|
||||||
|
|
||||||
Modify `.playground/playground.nav.ts`, dans la section `NAVIGATION`, ajouter la ligne Modal juste après le Drawer :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
{
|
|
||||||
label: 'NAVIGATION',
|
|
||||||
icon: 'mdi:navigation-variant',
|
|
||||||
items: [
|
|
||||||
{label: 'Sidebar', to: '/composant/sidebar/sidebar'},
|
|
||||||
{label: 'Drawer', to: '/composant/drawer/drawer'},
|
|
||||||
{label: 'Modal', to: '/composant/modal/modal'},
|
|
||||||
{label: 'Onglets', to: '/composant/tab/tabList'},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 3: Vérifier le lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: 0 erreur.
|
|
||||||
|
|
||||||
- [ ] **Step 4: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add .playground/pages/composant/modal/modal.vue .playground/playground.nav.ts
|
|
||||||
git commit -m "docs : page playground Modal (#MUI-36)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 3: Story Histoire
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/story/modal/modal.story.vue`
|
|
||||||
|
|
||||||
- [ ] **Step 1: Créer la story**
|
|
||||||
|
|
||||||
Create `app/story/modal/modal.story.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { ref } from 'vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'ModalStory' })
|
|
||||||
|
|
||||||
const showBase = ref(false)
|
|
||||||
const showForm = ref(false)
|
|
||||||
const showNoDismiss = ref(false)
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<Story title="Overlay/Modal">
|
|
||||||
<Variant title="Simple">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showBase = true"
|
|
||||||
>
|
|
||||||
Ouvrir
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showBase">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Détails</h2>
|
|
||||||
</template>
|
|
||||||
<p>Contenu simple de la modal.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
|
|
||||||
<Variant title="Avec footer d'actions">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showForm = true"
|
|
||||||
>
|
|
||||||
Ouvrir le formulaire
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showForm" modal-class="max-w-lg">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Nouveau contact</h2>
|
|
||||||
</template>
|
|
||||||
<div class="flex flex-col gap-4 py-2">
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<MalioInputText label="Prénom" />
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="showForm = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
|
|
||||||
<Variant title="Non dismissable">
|
|
||||||
<div class="p-4">
|
|
||||||
<button
|
|
||||||
class="rounded bg-m-btn-primary px-4 py-2 text-white"
|
|
||||||
@click="showNoDismiss = true"
|
|
||||||
>
|
|
||||||
Ouvrir
|
|
||||||
</button>
|
|
||||||
<MalioModal v-model="showNoDismiss" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-xl font-bold">Action requise</h2>
|
|
||||||
</template>
|
|
||||||
<p>Ni le backdrop ni Échap ne ferment cette modal. Utilisez la croix.</p>
|
|
||||||
</MalioModal>
|
|
||||||
</div>
|
|
||||||
</Variant>
|
|
||||||
</Story>
|
|
||||||
</template>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2: Vérifier le lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: 0 erreur (notamment pas de `vue/multi-word-component-names` grâce au `defineOptions`).
|
|
||||||
|
|
||||||
- [ ] **Step 3: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/story/modal/modal.story.vue
|
|
||||||
git commit -m "docs : story Histoire Modal (#MUI-36)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Task 4: Documentation (COMPONENTS.md + CHANGELOG.md)
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `COMPONENTS.md` (insérer après la section `## MalioDrawer`, juste avant `## MalioDataTable`)
|
|
||||||
- Modify: `CHANGELOG.md` (ligne sous `### Added`)
|
|
||||||
|
|
||||||
- [ ] **Step 1: Ajouter la section dans COMPONENTS.md**
|
|
||||||
|
|
||||||
Dans `COMPONENTS.md`, insérer ce bloc juste après le `---` qui clôt la section `## MalioDrawer` (et avant `## MalioDataTable`) :
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
## MalioModal
|
|
||||||
|
|
||||||
Boîte de dialogue modale centrée avec backdrop semi-transparent. Gère l'accessibilité (focus-trap, restitution du focus, `Échap`), le verrouillage du scroll de la page et un empilement correct de plusieurs modals. Structure : header fixe, body scrollable (`max-h-[85vh]`), footer fixe.
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Description |
|
|
||||||
|------|------|--------|-------------|
|
|
||||||
| `id` | `string` | auto | Identifiant HTML |
|
|
||||||
| `modelValue` | `boolean` | `undefined` | État ouvert/fermé (v-model) |
|
|
||||||
| `showClose` | `boolean` | `true` | Afficher le bouton de fermeture (croix) |
|
|
||||||
| `dismissable` | `boolean` | `true` | Fermer au clic sur le backdrop |
|
|
||||||
| `closeOnEscape` | `boolean` | `true` | Fermer avec la touche `Échap` |
|
|
||||||
| `ariaLabel` | `string` | `''` | Nom accessible de secours quand le slot `#header` est absent |
|
|
||||||
| `modalClass` | `string` | `''` | Classes CSS panneau, ex. largeur `max-w-lg` (twMerge) |
|
|
||||||
| `overlayClass` | `string` | `''` | Classes CSS backdrop (twMerge) |
|
|
||||||
| `headerClass` | `string` | `''` | Classes CSS barre header (twMerge) |
|
|
||||||
| `bodyClass` | `string` | `''` | Classes CSS zone scrollable (twMerge) |
|
|
||||||
| `footerClass` | `string` | `''` | Classes CSS footer fixe (twMerge) |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: boolean)`, `close()`
|
|
||||||
|
|
||||||
**Slots :**
|
|
||||||
- `header` — en-tête (titre, etc.). S'il est absent et que `showClose` est `true`, seule la croix est affichée.
|
|
||||||
- `default` — contenu (zone scrollable).
|
|
||||||
- `footer` — actions (boutons). Rendu en bas, fixe, séparé par une bordure. N'apparaît que si le slot est fourni.
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<MalioModal v-model="isOpen">
|
|
||||||
<template #header>
|
|
||||||
<h2 class="text-[24px] font-bold">Détails</h2>
|
|
||||||
</template>
|
|
||||||
<p>Contenu de la modal</p>
|
|
||||||
</MalioModal>
|
|
||||||
|
|
||||||
<!-- Largeur custom + footer d'actions -->
|
|
||||||
<MalioModal v-model="isOpen" modal-class="max-w-lg">
|
|
||||||
<template #header><h2>Nouveau contact</h2></template>
|
|
||||||
<MalioInputText label="Nom" />
|
|
||||||
<template #footer>
|
|
||||||
<MalioButton label="Annuler" variant="secondary" button-class="flex-1" @click="isOpen = false" />
|
|
||||||
<MalioButton label="Enregistrer" button-class="flex-1" @click="isOpen = false" />
|
|
||||||
</template>
|
|
||||||
</MalioModal>
|
|
||||||
|
|
||||||
<!-- Non fermable au backdrop / Échap (croix uniquement) -->
|
|
||||||
<MalioModal v-model="isOpen" :dismissable="false" :close-on-escape="false">
|
|
||||||
<template #header><h2>Action requise</h2></template>
|
|
||||||
<p>Fermeture via la croix uniquement</p>
|
|
||||||
</MalioModal>
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2: Ajouter l'entrée CHANGELOG**
|
|
||||||
|
|
||||||
Dans `CHANGELOG.md`, sous `### Added`, ajouter en dernière ligne de la liste (après la ligne DateTime) :
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
* [#MUI-36] Création d'un composant modal (dialogue centré, focus-trap, scroll-lock, footer fixe)
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 3: Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add COMPONENTS.md CHANGELOG.md
|
|
||||||
git commit -m "docs : documentation du composant Modal (#MUI-36)
|
|
||||||
|
|
||||||
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Vérification finale
|
|
||||||
|
|
||||||
- [ ] `npx vitest run app/components/malio/modal/Modal.test.ts` → tous verts.
|
|
||||||
- [ ] `npm run lint` → 0 erreur.
|
|
||||||
- [ ] `npm run dev` → la page `/composant/modal/modal` s'affiche, l'entrée « Modal » est dans la nav sous NAVIGATION, les 4 démos fonctionnent (ouverture, fermeture backdrop/Échap/croix, scroll interne, non-dismissable).
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,161 +0,0 @@
|
|||||||
# État visuel `readonly` cohérent — Implementation Plan
|
|
||||||
|
|
||||||
> **For agentic workers:** REQUIRED SUB-SKILL: superpowers:subagent-driven-development. Steps use checkbox (`- [ ]`) syntax.
|
|
||||||
|
|
||||||
**Goal:** Donner aux champs `readonly` un état visuel distinct et cohérent : bordure noire même vide, aucun grossissement/bleu au focus, label gris→noir selon rempli, icône gris→noir selon rempli.
|
|
||||||
|
|
||||||
**Architecture:** Pas de composant partagé (les styles sont dupliqués par composant, on suit ce pattern). Dans chaque composant on rend conditionnelles 4 zones de classes selon `readonly`. Le champ reste focusable (sélection/copie du texte) mais sans visuel de focus.
|
|
||||||
|
|
||||||
**Tech Stack:** Vue 3 `<script setup>`, Tailwind `m-*`, `twMerge`, Vitest + @vue/test-utils.
|
|
||||||
|
|
||||||
**Branche:** `feature/MUI-41-props-required-asterisque-dans-le-label-sur-les-co` (on continue dessus).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## La recette commune (appliquée quand `readonly === true`)
|
|
||||||
|
|
||||||
Priorité inchangée : `error` puis `success` puis `disabled` passent TOUJOURS avant `readonly`. La recette readonly ne s'applique que dans la branche « état normal ».
|
|
||||||
|
|
||||||
1. **Bordure** : forcer `border-black` (même vide). Ne PAS inclure `border-m-muted` ni `focus:border-m-primary` quand readonly.
|
|
||||||
2. **Grow + bleu** : ne PAS inclure la classe `grow-height` (donc pas de grossissement au focus) ni les classes `focus:*` (border, padding `focus:pl-*`/`focus:!pl-*`). Pour `InputTextArea` (pas de `grow-height`) : retirer `focus:border-m-primary` et le surlignage de focus `textarea-scrollbar-primary`.
|
|
||||||
3. **Label** : utiliser `isFilled ? 'text-black' : 'text-m-muted'` ; ne PAS inclure `peer-focus:text-m-primary` ni les combos `peer-placeholder-shown`/`peer-[&:not(:placeholder-shown):not(:focus)]`. De plus, en readonly, `shouldFloatLabel` (ou équivalent qui pilote le float) doit ignorer `isFocused` → float basé sur `isFilled` seul (un champ readonly vide garde son label gris au repos).
|
|
||||||
4. **Icône** : `isFilled ? 'text-black' : 'text-m-muted'` ; sauter la branche `isFocused → text-m-primary`. (`error`/`success`/`disabled` toujours prioritaires.)
|
|
||||||
5. **Interaction** : `readonly` bloque l'ouverture (Upload : `openFilePicker` no-op ; pickers : déjà bloqué). Le champ reste sélectionnable (ne pas retirer la focusabilité).
|
|
||||||
|
|
||||||
Implémentation conseillée : un petit computed `isReadonly = computed(() => props.readonly && !props.disabled)` (disabled prime), puis dans chaque `twMerge(...)` remplacer les fragments concernés par des expressions ternaires sur `props.readonly`. Garder le code lisible et homogène avec l'existant du fichier.
|
|
||||||
|
|
||||||
### Patron de test (adapter le sélecteur input/textarea et le helper de montage du fichier)
|
|
||||||
|
|
||||||
```ts
|
|
||||||
it('readonly : bordure noire même vide, pas de grow/bleu', () => {
|
|
||||||
const wrapper = mountX({label: 'Champ', readonly: true}) // pas de modelValue → vide
|
|
||||||
const field = wrapper.get('input') // ou 'textarea'
|
|
||||||
expect(field.classes()).toContain('border-black')
|
|
||||||
expect(field.classes()).not.toContain('border-m-muted')
|
|
||||||
expect(field.classes()).not.toContain('grow-height') // sauf InputTextArea (pas de grow-height) : asserter l'absence de 'focus:border-m-primary'
|
|
||||||
expect(field.classes()).not.toContain('focus:border-m-primary')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly : label gris si vide, pas de bleu', () => {
|
|
||||||
const wrapper = mountX({label: 'Champ', readonly: true})
|
|
||||||
const label = wrapper.get('label')
|
|
||||||
expect(label.classes()).not.toContain('peer-focus:text-m-primary')
|
|
||||||
expect(label.classes()).toContain('text-m-muted')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('readonly rempli : label noir + icône noire', () => {
|
|
||||||
const wrapper = mountX({label: 'Champ', readonly: true, modelValue: '...valeur remplie...'})
|
|
||||||
expect(wrapper.get('label').classes()).toContain('text-black')
|
|
||||||
// si le composant a une icône d'état :
|
|
||||||
expect(wrapper.get('[data-test="icon"]').classes()).toContain('text-black')
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
Pour les composants à icône d'état, ajouter aussi : readonly + vide → icône `text-m-muted`. Adapter `modelValue` au type (montant, date ISO, etc.). Pour les pickers, la « valeur remplie » se passe via la prop d'affichage habituelle (voir tests voisins).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 1 : `InputUpload` (ajout de la prop `readonly`)
|
|
||||||
|
|
||||||
`InputUpload` n'a PAS de prop `readonly` aujourd'hui (son `<input type="text">` est `:readonly="true"` en dur pour empêcher la saisie). On AJOUTE une vraie prop `readonly`.
|
|
||||||
|
|
||||||
**Files:** Modify `app/components/malio/input/InputUpload.vue` ; Test `app/components/malio/input/InputUpload.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 — tests d'abord** : ajouter le patron de test ci-dessus. Champ = `wrapper.get('input[type="text"]')`. Icône = `[data-test="icon"]` (le nuage). « rempli » = `modelValue: 'fichier.pdf'`.
|
|
||||||
- [ ] **Step 2 — run, FAIL** : `npm run test -- app/components/malio/input/InputUpload.test.ts`
|
|
||||||
- [ ] **Step 3 — ajouter la prop** : `readonly?: boolean` dans `defineProps` + `readonly: false` dans `withDefaults`.
|
|
||||||
- [ ] **Step 4 — appliquer la recette** dans `mergedInputClass`, `mergedLabelClass`, `iconStateClass` et `shouldFloatLabel` (float = `isFilled` quand readonly). Forcer `cursor-default` (au lieu de `cursor-pointer`) quand readonly.
|
|
||||||
- [ ] **Step 5 — bloquer l'ouverture** : dans `openFilePicker`, `if (props.disabled || props.readonly) return`.
|
|
||||||
- [ ] **Step 6 — run, PASS** : même commande. (Suite flaky connue : relancer le fichier si timeout non lié ; `--no-verify` si un timeout flaky bloque un commit déjà vérifié.)
|
|
||||||
- [ ] **Step 7 — commit**
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/input/InputUpload.vue app/components/malio/input/InputUpload.test.ts
|
|
||||||
git commit -m "feat(ui) : état readonly visuel sur InputUpload (+ prop readonly)"
|
|
||||||
```
|
|
||||||
(corps + ligne vide + `Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>`)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 2 : Inputs floating-label standard (lot de 6)
|
|
||||||
|
|
||||||
`InputText`, `InputEmail`, `InputAmount`, `InputAutocomplete`, `InputPassword`, `InputTextArea` ont déjà une prop `readonly`. Appliquer la recette à chacun.
|
|
||||||
|
|
||||||
**Files:** Modify les 6 `.vue` (`app/components/malio/input/InputText.vue`, `InputEmail.vue`, `InputAmount.vue`, `InputAutocomplete.vue`, `InputPassword.vue`, `InputTextArea.vue`) ; Test les 6 `*.test.ts` correspondants (`Input.test.ts` pour InputText, puis `InputEmail/InputAmount/InputAutocomplete/InputPassword/InputTextArea.test.ts`).
|
|
||||||
|
|
||||||
Spécificités par fichier :
|
|
||||||
- **InputText / InputEmail / InputAmount** : structure identique (`mergedInputClass` avec `grow-height` + `focus:border-m-primary` + `focus:pl-[11px]` ; `mergedLabelClass` avec `peer-focus:text-m-primary` ; `iconStateClass` avec branche `isFocused`). Appliquer la recette 1-4.
|
|
||||||
- **InputAutocomplete** : idem ; il a deux usages de `iconStateClass` (icône gauche + chevron) — appliquer la recette à `iconStateClass`. `isFilled` y inclut `hasSelection`.
|
|
||||||
- **InputPassword** : recette 1-4. L'icône est le **toggle œil** (cliquable) : garder le `@click` de bascule ; seule la couleur suit la recette (pas de bleu). NE PAS rendre l'œil non-cliquable en readonly.
|
|
||||||
- **InputTextArea** : classes **inline** dans le template (pas de `grow-height`). Recette : `isFilled ? border-black : border-m-muted` → `readonly ? border-black : (isFilled ? border-black : border-m-muted)` ; retirer `focus:border-m-primary` et le `isFocused ? 'textarea-scrollbar-primary'` quand readonly ; label idem. Pas d'icône (recette 4 N/A).
|
|
||||||
|
|
||||||
- [ ] **Step 1 — tests d'abord** : ajouter le patron à chacun des 6 fichiers test (champ = `input`, sauf TextArea = `textarea` ; pour TextArea ne pas asserter `grow-height`). Pour les composants à icône, asserter aussi l'icône (`[data-test="icon"]`). Adapter `modelValue` rempli au type (Amount : un montant valide).
|
|
||||||
- [ ] **Step 2 — run, FAIL** : `npm run test -- app/components/malio/input/Input.test.ts app/components/malio/input/InputEmail.test.ts app/components/malio/input/InputAmount.test.ts app/components/malio/input/InputAutocomplete.test.ts app/components/malio/input/InputPassword.test.ts app/components/malio/input/InputTextArea.test.ts`
|
|
||||||
- [ ] **Step 3 — appliquer la recette** aux 6 `.vue`.
|
|
||||||
- [ ] **Step 4 — run, PASS** : même commande (relancer un fichier si flaky).
|
|
||||||
- [ ] **Step 5 — commit**
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/input/InputText.vue app/components/malio/input/InputEmail.vue app/components/malio/input/InputAmount.vue app/components/malio/input/InputAutocomplete.vue app/components/malio/input/InputPassword.vue app/components/malio/input/InputTextArea.vue app/components/malio/input/Input.test.ts app/components/malio/input/InputEmail.test.ts app/components/malio/input/InputAmount.test.ts app/components/malio/input/InputAutocomplete.test.ts app/components/malio/input/InputPassword.test.ts app/components/malio/input/InputTextArea.test.ts
|
|
||||||
git commit -m "feat(ui) : état readonly visuel sur les inputs floating-label"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 3 : `InputPhone` (découpler readonly de disabled)
|
|
||||||
|
|
||||||
Aujourd'hui `InputPhone` traite `disabled || readonly` ensemble (bouton « add » + `opacity-40`, look désactivé). On découple : readonly applique la recette readonly (bordure noire, pas de look disabled), tout en restant non-éditable. L'action « add » reste bloquée en readonly mais le **champ** ne doit plus avoir l'apparence désactivée.
|
|
||||||
|
|
||||||
**Files:** Modify `app/components/malio/input/InputPhone.vue` ; Test `app/components/malio/input/InputPhone.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 — tests d'abord** : patron readonly (champ = `input`, icône = `[data-test="icon"]`). Ajouter aussi une assertion que le champ readonly n'a PAS `opacity-40` (plus de look disabled). `modelValue` rempli = un numéro.
|
|
||||||
- [ ] **Step 2 — run, FAIL** : `npm run test -- app/components/malio/input/InputPhone.test.ts`
|
|
||||||
- [ ] **Step 3 — appliquer la recette** à `mergedInputClass`/`mergedLabelClass`/`iconStateClass` (recette 1-4). Pour le bouton « add » (`mergedAddButtonClass`) : garder l'action bloquée en readonly (`onAdd` retourne déjà), mais retirer l'apparence `opacity-40 cursor-not-allowed` spécifique au readonly — la garder uniquement pour `disabled`. (En readonly, le bouton add suit la couleur d'icône readonly.)
|
|
||||||
- [ ] **Step 4 — run, PASS** (relancer si flaky).
|
|
||||||
- [ ] **Step 5 — commit**
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/input/InputPhone.vue app/components/malio/input/InputPhone.test.ts
|
|
||||||
git commit -m "feat(ui) : InputPhone readonly suit les règles readonly (plus de look disabled)"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 4 : Pickers `CalendarField` (date family) + `TimePicker`
|
|
||||||
|
|
||||||
`CalendarField` (rend Date/DateTime/DateRange/DateWeek) et `TimePicker` ont déjà une prop `readonly` qui bloque l'ouverture du popover. Appliquer la recette visuelle. Leur input interne est déjà `readonly` natif ; le float du label suit `isFilled || isOpen` — en readonly, `isOpen` reste faux (ouverture bloquée), donc float = `isFilled`. Forcer bordure noire, label gris→noir, icône gris→noir sans branche focus/open.
|
|
||||||
|
|
||||||
**Files:** Modify `app/components/malio/date/internal/CalendarField.vue`, `app/components/malio/time/TimePicker.vue` ; Test `app/components/malio/date/Date.test.ts` (couvre CalendarField) et `app/components/malio/time/TimePicker.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 — tests d'abord** : patron readonly. Pour `Date.test.ts`, monter `mountDate({label, readonly: true})` et une variante remplie (passer une valeur de date ISO comme les tests voisins). Champ = l'input du composant (voir sélecteur utilisé par les tests voisins). Pour `TimePicker.test.ts`, utiliser le helper du fichier.
|
|
||||||
- [ ] **Step 2 — run, FAIL** : `npm run test -- app/components/malio/date/Date.test.ts app/components/malio/time/TimePicker.test.ts`
|
|
||||||
- [ ] **Step 3 — appliquer la recette** à `CalendarField.vue` et `TimePicker.vue` (`mergedInputClass`/`mergedLabelClass`/`iconStateClass` ; float = `isFilled` en readonly). Vérifier que la croix « clear » reste masquée en readonly (déjà le cas — ne pas régresser).
|
|
||||||
- [ ] **Step 4 — run, PASS** (relancer si flaky).
|
|
||||||
- [ ] **Step 5 — commit**
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/date/internal/CalendarField.vue app/components/malio/time/TimePicker.vue app/components/malio/date/Date.test.ts app/components/malio/time/TimePicker.test.ts
|
|
||||||
git commit -m "feat(ui) : état readonly visuel sur pickers date/heure"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 5 : Playground + vérification finale
|
|
||||||
|
|
||||||
**Files:** Modify les pages playground concernées sous `.playground/pages/composant/...`
|
|
||||||
|
|
||||||
- [ ] **Step 1 — exemples readonly** : ajouter sur chaque page concernée (inputText, inputEmail, inputAmount, inputAutocomplete, inputPassword, inputTextArea, inputPhone, **inputUpload** [manquant], date, timePicker) un exemple readonly : une instance vide (`:readonly="true"`) ET une instance remplie readonly, pour visualiser bordure noire vide + label/icône noir rempli. Suivre le pattern de chaque page ; si une page rend l'ajout coûteux, le signaler et passer (mais inputUpload est demandé explicitement, le faire).
|
|
||||||
- [ ] **Step 2 — lint** : `npm run lint` → 0 erreur (baseline 24 warnings préexistants).
|
|
||||||
- [ ] **Step 3 — suite complète** : `npm run test` → tout vert (relancer un fichier en cas de timeout flaky).
|
|
||||||
- [ ] **Step 4 — commit**
|
|
||||||
```bash
|
|
||||||
git add .playground
|
|
||||||
git commit -m "docs(playground) : exemples readonly"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Récapitulatif commits attendus
|
|
||||||
1. `feat(ui) : état readonly visuel sur InputUpload (+ prop readonly)`
|
|
||||||
2. `feat(ui) : état readonly visuel sur les inputs floating-label`
|
|
||||||
3. `feat(ui) : InputPhone readonly suit les règles readonly (plus de look disabled)`
|
|
||||||
4. `feat(ui) : état readonly visuel sur pickers date/heure`
|
|
||||||
5. `docs(playground) : exemples readonly`
|
|
||||||
|
|
||||||
Note convention : le hook commit-msg malio impose un espace avant `:`.
|
|
||||||
@@ -1,460 +0,0 @@
|
|||||||
# État « obligatoire » cohérent + normalisation email — Implementation Plan
|
|
||||||
|
|
||||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
|
||||||
|
|
||||||
**Goal:** Exposer une prop `required` cohérente avec astérisque rouge dans le label sur toute la famille formulaire, et ajouter une sanitisation à la saisie (suppression des espaces + option `lowercase`) à `MalioInputEmail`.
|
|
||||||
|
|
||||||
**Architecture :** Un composant présentational partagé `MalioRequiredMark` (astérisque `aria-hidden`, token `text-m-danger`) est importé explicitement et rendu dans le `<label>` de chaque composant quand `required` est vrai. Les 4 composants sans la prop la reçoivent (+ câblage `aria-required` là où il n'y a pas de `required` natif). `MalioInputEmail.onInput` sanitise la valeur avant émission.
|
|
||||||
|
|
||||||
**Tech Stack :** Nuxt 4 layer, Vue 3 `<script setup lang="ts">`, Tailwind (palette `m-*`), `tailwind-merge`, Vitest + `@vue/test-utils` (jsdom).
|
|
||||||
|
|
||||||
**Spec :** `docs/superpowers/specs/2026-06-03-required-asterisk-email-sanitization-design.md`
|
|
||||||
|
|
||||||
**Conventions de test (rappel) :** chaque fichier `*.test.ts` définit son propre helper de montage (nom variable : `mountInput`, `mountDate`, `mountCheckbox`, `mountTime`, `mountComponent`…) ou monte en inline. Le tableau de chaque tâche indique le helper exact à réutiliser.
|
|
||||||
|
|
||||||
**⚠️ Suite flaky :** des timeouts intermittents existent sur diverses suites. Si un test échoue par timeout sans rapport avec le changement, relancer le fichier ciblé ; ne pas conclure à un échec sans relance. Le hook pre-commit lance les tests — si un timeout flaky bloque un commit déjà vérifié manuellement, utiliser `git commit --no-verify`.
|
|
||||||
|
|
||||||
**Branche :** `feature/MUI-41-props-required-asterisque-dans-le-label-sur-les-co` (rester dessus, ne pas créer de branche).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 1 : Composant partagé `MalioRequiredMark`
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Create: `app/components/malio/shared/RequiredMark.vue`
|
|
||||||
- Test: `app/components/malio/shared/RequiredMark.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire le test qui échoue**
|
|
||||||
|
|
||||||
Create `app/components/malio/shared/RequiredMark.test.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import {describe, expect, it} from 'vitest'
|
|
||||||
import {mount} from '@vue/test-utils'
|
|
||||||
import RequiredMark from './RequiredMark.vue'
|
|
||||||
|
|
||||||
describe('MalioRequiredMark', () => {
|
|
||||||
it('rend un astérisque', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.text()).toBe('*')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('est masqué pour les technologies d’assistance', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.get('[data-test="required-mark"]').attributes('aria-hidden')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('utilise le token de couleur danger', () => {
|
|
||||||
const wrapper = mount(RequiredMark)
|
|
||||||
expect(wrapper.get('[data-test="required-mark"]').classes()).toContain('text-m-danger')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer le test, vérifier l'échec**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/shared/RequiredMark.test.ts`
|
|
||||||
Expected: FAIL — `Failed to resolve import './RequiredMark.vue'` (le composant n'existe pas encore).
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Créer le composant**
|
|
||||||
|
|
||||||
Create `app/components/malio/shared/RequiredMark.vue` :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
<template>
|
|
||||||
<span
|
|
||||||
data-test="required-mark"
|
|
||||||
aria-hidden="true"
|
|
||||||
class="ml-0.5 select-none text-m-danger"
|
|
||||||
>*</span>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
defineOptions({name: 'MalioRequiredMark', inheritAttrs: false})
|
|
||||||
</script>
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Lancer le test, vérifier le succès**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/shared/RequiredMark.test.ts`
|
|
||||||
Expected: PASS (3 tests).
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/shared/RequiredMark.vue app/components/malio/shared/RequiredMark.test.ts
|
|
||||||
git commit -m "feat(ui): composant partagé MalioRequiredMark (astérisque champ obligatoire)"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 2 : Prop `required` + a11y + astérisque sur les 4 composants sans la prop
|
|
||||||
|
|
||||||
Composants : `Select`, `SelectCheckbox`, `InputUpload`, `InputRichText`. Chacun reçoit la prop `required`, le câblage a11y adapté, l'import + le rendu de l'astérisque, et un test.
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `app/components/malio/select/Select.vue`, `app/components/malio/select/SelectCheckbox.vue`, `app/components/malio/input/InputUpload.vue`, `app/components/malio/input/InputRichText.vue`
|
|
||||||
- Test: `app/components/malio/select/Select.test.ts`, `app/components/malio/select/SelectCheckbox.test.ts`, `app/components/malio/input/InputUpload.test.ts`, `app/components/malio/input/InputRichText.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire les tests qui échouent (un par composant)**
|
|
||||||
|
|
||||||
Patron d'assertion (à adapter au helper de chaque fichier) :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
it('affiche l’astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = /* monter avec { label: 'Champ', required: true, ...props requises } */
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n’affiche pas l’astérisque par défaut', () => {
|
|
||||||
const wrapper = /* monter avec { label: 'Champ', ...props requises } */
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
Montage par fichier :
|
|
||||||
|
|
||||||
| Fichier test | Montage |
|
|
||||||
|---|---|
|
|
||||||
| `select/Select.test.ts` | inline : `mount(SelectForTest, {props: {label: 'Champ', required: true, options: [{label: 'A', value: 'a'}]}})` (et sans `required` pour le 2ᵉ test) |
|
|
||||||
| `select/SelectCheckbox.test.ts` | inline : `mount(SelectCheckboxForTest, {props: {label: 'Champ', required: true, options: [{label: 'A', value: 'a'}]}})` |
|
|
||||||
| `input/InputUpload.test.ts` | helper existant `mountComponent({label: 'Champ', required: true})` |
|
|
||||||
| `input/InputRichText.test.ts` | helper existant `mountComponent({label: 'Champ', required: true})` |
|
|
||||||
|
|
||||||
> Note : pour `Select`/`SelectCheckbox`, reprendre la forme exacte des `options` et les `global.stubs` déjà utilisés dans les autres `it()` du fichier (copier un montage voisin).
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer les tests, vérifier l'échec**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/select/Select.test.ts app/components/malio/select/SelectCheckbox.test.ts app/components/malio/input/InputUpload.test.ts app/components/malio/input/InputRichText.test.ts`
|
|
||||||
Expected: FAIL sur les nouveaux tests « affiche l’astérisque » (la prop/le rendu n'existent pas encore).
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Ajouter la prop `required` (type + défaut) dans les 4 composants**
|
|
||||||
|
|
||||||
Dans chaque `defineProps<{…}>()`, ajouter la ligne :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
required?: boolean
|
|
||||||
```
|
|
||||||
|
|
||||||
Dans chaque `withDefaults(…, { … })`, ajouter :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
required: false,
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Câbler l'accessibilité (un élément interactif par composant)**
|
|
||||||
|
|
||||||
`Select.vue` — sur le `<button>` déclencheur (là où sont déjà `:aria-expanded`, `:aria-controls`), ajouter :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
:aria-required="required || undefined"
|
|
||||||
```
|
|
||||||
|
|
||||||
`SelectCheckbox.vue` — idem, sur son `<button>` déclencheur :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
:aria-required="required || undefined"
|
|
||||||
```
|
|
||||||
|
|
||||||
`InputUpload.vue` — sur l'`<input type="file">`, ajouter l'attribut natif :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
:required="required"
|
|
||||||
```
|
|
||||||
|
|
||||||
`InputRichText.vue` — sur le wrapper éditeur identifié par `:id="editorId"` (le conteneur de `<EditorContent>` en mode éditable), ajouter :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
:aria-required="required || undefined"
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Importer et rendre l'astérisque dans les 4 composants**
|
|
||||||
|
|
||||||
Dans le `<script setup>` de chacun, ajouter l'import (chemin relatif depuis `family/Component.vue`) :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
import MalioRequiredMark from '../shared/RequiredMark.vue'
|
|
||||||
```
|
|
||||||
|
|
||||||
Dans le `<template>`, remplacer le rendu du libellé `{{ label }}` (celui à l'intérieur du `<label>` du champ — **pas** un `{{ opt.label }}`) par :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
|
||||||
```
|
|
||||||
|
|
||||||
> Respecter l'indentation existante de chaque fichier. Pour `Select`/`SelectCheckbox`, viser le `{{ label }}` du `<label>` flottant, pas le `{{ opt.label }}` des options.
|
|
||||||
|
|
||||||
- [ ] **Step 6 : Lancer les tests, vérifier le succès**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/select/Select.test.ts app/components/malio/select/SelectCheckbox.test.ts app/components/malio/input/InputUpload.test.ts app/components/malio/input/InputRichText.test.ts`
|
|
||||||
Expected: PASS (anciens + nouveaux tests). En cas de timeout flaky non lié, relancer le fichier concerné.
|
|
||||||
|
|
||||||
- [ ] **Step 7 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/select/Select.vue app/components/malio/select/SelectCheckbox.vue app/components/malio/input/InputUpload.vue app/components/malio/input/InputRichText.vue app/components/malio/select/Select.test.ts app/components/malio/select/SelectCheckbox.test.ts app/components/malio/input/InputUpload.test.ts app/components/malio/input/InputRichText.test.ts
|
|
||||||
git commit -m "feat(ui): prop required + aria-required + astérisque sur Select/SelectCheckbox/Upload/RichText"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 3 : Astérisque sur les composants ayant déjà `required`
|
|
||||||
|
|
||||||
Ces composants ont déjà la prop `required` (câblée nativement). On ajoute uniquement l'import + le rendu de l'astérisque + un test.
|
|
||||||
|
|
||||||
**Files (16 composants → 13 via CalendarField mutualisé) :**
|
|
||||||
|
|
||||||
| Composant `.vue` | Import à ajouter | Fichier test | Helper de montage |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `input/InputText.vue` | `'../shared/RequiredMark.vue'` | `input/Input.test.ts` | `mountInput({label:'Champ', required:true})` |
|
|
||||||
| `input/InputEmail.vue` | `'../shared/RequiredMark.vue'` | `input/InputEmail.test.ts` | `mountComponent({label:'Champ', required:true})` |
|
|
||||||
| `input/InputPhone.vue` | `'../shared/RequiredMark.vue'` | `input/InputPhone.test.ts` | `mountComponent({label:'Champ', required:true})` |
|
|
||||||
| `input/InputPassword.vue` | `'../shared/RequiredMark.vue'` | `input/InputPassword.test.ts` | `mountComponent({label:'Champ', required:true})` |
|
|
||||||
| `input/InputTextArea.vue` | `'../shared/RequiredMark.vue'` | `input/InputTextArea.test.ts` | helper du fichier (`mount<…>` ; copier un montage voisin) |
|
|
||||||
| `input/InputAmount.vue` | `'../shared/RequiredMark.vue'` | `input/InputAmount.test.ts` | helper du fichier |
|
|
||||||
| `input/InputNumber.vue` | `'../shared/RequiredMark.vue'` | `input/InputNumber.test.ts` | helper du fichier |
|
|
||||||
| `input/InputAutocomplete.vue` | `'../shared/RequiredMark.vue'` | `input/InputAutocomplete.test.ts` | `mountComponent({label:'Champ', required:true, …props requises})` |
|
|
||||||
| `checkbox/Checkbox.vue` | `'../shared/RequiredMark.vue'` | `checkbox/Checkbox.test.ts` | `mountCheckbox({label:'Champ', required:true})` |
|
|
||||||
| `radio/RadioButton.vue` | `'../shared/RequiredMark.vue'` | `radio/RadioButton.test.ts` | helper du fichier |
|
|
||||||
| `time/Time.vue` | `'../shared/RequiredMark.vue'` | `time/Time.test.ts` | `mountTime({label:'Champ', required:true})` |
|
|
||||||
| `time/TimePicker.vue` | `'../shared/RequiredMark.vue'` | `time/TimePicker.test.ts` | helper du fichier |
|
|
||||||
| `date/internal/CalendarField.vue` | `'../../shared/RequiredMark.vue'` | `date/Date.test.ts` | `mountDate({label:'Champ', required:true})` |
|
|
||||||
|
|
||||||
> `CalendarField` rend le label de tout le date family (`Date`, `DateTime`, `DateRange`, `DateWeek`). Une seule modif + un seul test (via `Date.test.ts`) couvrent les quatre.
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire les tests qui échouent (un couple par fichier test du tableau)**
|
|
||||||
|
|
||||||
Pour chaque fichier test listé, ajouter :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
it('affiche l’astérisque quand required est vrai', () => {
|
|
||||||
const wrapper = /* helper du tableau, avec required: true */
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('n’affiche pas l’astérisque par défaut', () => {
|
|
||||||
const wrapper = /* helper du tableau, sans required */
|
|
||||||
expect(wrapper.find('[data-test="required-mark"]').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer les tests, vérifier l'échec**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/input app/components/malio/checkbox app/components/malio/radio app/components/malio/time app/components/malio/date/Date.test.ts`
|
|
||||||
Expected: FAIL sur les nouveaux tests « affiche l’astérisque ».
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Ajouter l'import + le rendu de l'astérisque dans les 13 `.vue`**
|
|
||||||
|
|
||||||
Dans chaque `<script setup>`, ajouter l'import indiqué dans la colonne « Import à ajouter ».
|
|
||||||
|
|
||||||
Dans chaque `<template>`, transformer le libellé du champ :
|
|
||||||
|
|
||||||
```vue
|
|
||||||
{{ label }}<MalioRequiredMark v-if="required" />
|
|
||||||
```
|
|
||||||
|
|
||||||
(Le `{{ label }}` est à l'intérieur du `<label v-if="label">` du champ. Respecter l'indentation propre à chaque fichier.)
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Lancer les tests, vérifier le succès**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/input app/components/malio/checkbox app/components/malio/radio app/components/malio/time app/components/malio/date/Date.test.ts`
|
|
||||||
Expected: PASS. (Vérifier notamment que `input/InputEmail.test.ts` « renders the label text » → `'Adresse email'` passe toujours : pas de `required` dans ce test, donc pas d'astérisque.) Relancer en cas de timeout flaky.
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/input app/components/malio/checkbox app/components/malio/radio app/components/malio/time app/components/malio/date/internal/CalendarField.vue app/components/malio/date/Date.test.ts
|
|
||||||
git commit -m "feat(ui): astérisque required dans le label de la famille formulaire"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 4 : Sanitisation de `MalioInputEmail`
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `app/components/malio/input/InputEmail.vue`
|
|
||||||
- Test: `app/components/malio/input/InputEmail.test.ts`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Écrire les tests qui échouent**
|
|
||||||
|
|
||||||
Ajouter à `input/InputEmail.test.ts` :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
it('supprime tous les espaces saisis', async () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
await wrapper.get('input').setValue(' a b @ c.com ')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['ab@c.com'])
|
|
||||||
expect(wrapper.get('input').element.value).toBe('ab@c.com')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('conserve la casse par défaut', async () => {
|
|
||||||
const wrapper = mountComponent()
|
|
||||||
await wrapper.get('input').setValue('User@Example.COM')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['User@Example.COM'])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('met en minuscules quand lowercase est vrai', async () => {
|
|
||||||
const wrapper = mountComponent({lowercase: true})
|
|
||||||
await wrapper.get('input').setValue('User@Example.COM')
|
|
||||||
const emits = wrapper.emitted('update:modelValue')!
|
|
||||||
expect(emits[emits.length - 1]).toEqual(['user@example.com'])
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
> Ajouter `lowercase?: boolean` au type `InputEmailProps` en tête du fichier de test (sinon TS refuse la prop dans le 3ᵉ test).
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lancer les tests, vérifier l'échec**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/input/InputEmail.test.ts`
|
|
||||||
Expected: FAIL — les espaces ne sont pas supprimés / `lowercase` inconnu.
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Ajouter la prop `lowercase`**
|
|
||||||
|
|
||||||
Dans `defineProps<{…}>()` de `InputEmail.vue`, ajouter :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
lowercase?: boolean
|
|
||||||
```
|
|
||||||
|
|
||||||
Dans `withDefaults(…, { … })`, ajouter :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
lowercase: false,
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Ajouter la fonction de sanitisation et réécrire `onInput`**
|
|
||||||
|
|
||||||
Ajouter la fonction pure (au-dessus de `onInput`) :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const sanitizeEmail = (v: string) => {
|
|
||||||
let out = v.replace(/\s+/g, '')
|
|
||||||
if (props.lowercase) out = out.toLowerCase()
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Remplacer le `onInput` existant par :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const onInput = (event: Event) => {
|
|
||||||
const target = event.target as HTMLInputElement
|
|
||||||
const raw = target.value
|
|
||||||
const sanitized = sanitizeEmail(raw)
|
|
||||||
|
|
||||||
if (sanitized !== raw) {
|
|
||||||
// `<input type="email">` ne supporte pas l'API de sélection :
|
|
||||||
// selectionStart vaut null, setSelectionRange lève. On garde defensivement.
|
|
||||||
const caret = target.selectionStart
|
|
||||||
target.value = sanitized
|
|
||||||
if (caret !== null) {
|
|
||||||
const newCaret = sanitizeEmail(raw.slice(0, caret)).length
|
|
||||||
try {
|
|
||||||
target.setSelectionRange(newCaret, newCaret)
|
|
||||||
} catch {
|
|
||||||
/* type d'input sans support de sélection — ignore */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isControlled.value) {
|
|
||||||
localValue.value = sanitized
|
|
||||||
}
|
|
||||||
emit('update:modelValue', sanitized)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 5 : Lancer les tests, vérifier le succès**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/input/InputEmail.test.ts`
|
|
||||||
Expected: PASS (anciens tests inclus, dont « emits update:modelValue on input change » avec `'new@example.com'` qui n'a pas d'espace → inchangé).
|
|
||||||
|
|
||||||
- [ ] **Step 6 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add app/components/malio/input/InputEmail.vue app/components/malio/input/InputEmail.test.ts
|
|
||||||
git commit -m "feat(inputs): sanitisation email (suppression des espaces + option lowercase)"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 5 : Documentation (`COMPONENTS.md` + `CHANGELOG.md`)
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: `COMPONENTS.md`, `CHANGELOG.md`
|
|
||||||
|
|
||||||
- [ ] **Step 1 : `COMPONENTS.md` — lignes `required` manquantes**
|
|
||||||
|
|
||||||
Pour les sections `MalioSelect`, `MalioSelectCheckbox`, `MalioInputUpload`, `MalioInputRichText`, ajouter dans le tableau des props la ligne (au même format que les autres composants) :
|
|
||||||
|
|
||||||
```
|
|
||||||
| `required` | `boolean` | `false` | Champ requis (affiche un astérisque rouge dans le label) |
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 2 : `COMPONENTS.md` — note astérisque + prop `lowercase`**
|
|
||||||
|
|
||||||
- Dans l'introduction de la famille formulaire (ou la section des props communes), ajouter une phrase : « Lorsque `required` est vrai, un astérisque rouge est ajouté dans le label (visuel ; la sémantique est portée par l'attribut `required`/`aria-required`). »
|
|
||||||
- Dans la section `MalioInputEmail`, ajouter la ligne de prop :
|
|
||||||
|
|
||||||
```
|
|
||||||
| `lowercase` | `boolean` | `false` | Normalise la saisie en minuscules à la frappe |
|
|
||||||
```
|
|
||||||
|
|
||||||
et préciser que les espaces sont supprimés automatiquement à la saisie (pas de masque ; la validation de format reste à la couche `error`).
|
|
||||||
|
|
||||||
- [ ] **Step 3 : `CHANGELOG.md` — entrées**
|
|
||||||
|
|
||||||
Sous le `### Added` de la version en cours (format `* [#…] …`), ajouter :
|
|
||||||
|
|
||||||
```
|
|
||||||
* [#MUI-41] Prop `required` cohérente + astérisque rouge dans le label sur la famille formulaire
|
|
||||||
* [#MUI-41] InputEmail : sanitisation à la saisie (suppression des espaces, option `lowercase`)
|
|
||||||
```
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Commit**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add COMPONENTS.md CHANGELOG.md
|
|
||||||
git commit -m "docs: required/astérisque + lowercase email (COMPONENTS + CHANGELOG)"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Task 6 : Exemples playground + vérification finale
|
|
||||||
|
|
||||||
**Files:**
|
|
||||||
- Modify: page(s) playground des composants concernés (selon `.playground/` ; cf. mémoire « Architecture playground »)
|
|
||||||
|
|
||||||
- [ ] **Step 1 : Ajouter des exemples légers**
|
|
||||||
|
|
||||||
Sur la page playground d'un composant représentatif (ex. `InputText`/`Select`), ajouter une instance `:required="true"`. Sur la page `InputEmail`, ajouter une instance `:lowercase="true"`. Si le coût d'intégration dépasse quelques minutes (routage/nav à câbler), le **noter** et passer — c'est hors scope strict du ticket.
|
|
||||||
|
|
||||||
- [ ] **Step 2 : Lint**
|
|
||||||
|
|
||||||
Run: `npm run lint`
|
|
||||||
Expected: 0 erreur. Corriger le cas échéant.
|
|
||||||
|
|
||||||
- [ ] **Step 3 : Suite de tests complète des fichiers touchés**
|
|
||||||
|
|
||||||
Run: `npm run test -- app/components/malio/shared app/components/malio/input app/components/malio/select app/components/malio/checkbox app/components/malio/radio app/components/malio/time app/components/malio/date`
|
|
||||||
Expected: PASS. En cas de timeout flaky, relancer le(s) fichier(s) concerné(s) individuellement.
|
|
||||||
|
|
||||||
- [ ] **Step 4 : Commit (si exemples playground ajoutés)**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git add .playground
|
|
||||||
git commit -m "docs(playground): exemples required + email lowercase"
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Récapitulatif des commits attendus
|
|
||||||
|
|
||||||
1. `feat(ui): composant partagé MalioRequiredMark (astérisque champ obligatoire)`
|
|
||||||
2. `feat(ui): prop required + aria-required + astérisque sur Select/SelectCheckbox/Upload/RichText`
|
|
||||||
3. `feat(ui): astérisque required dans le label de la famille formulaire`
|
|
||||||
4. `feat(inputs): sanitisation email (suppression des espaces + option lowercase)`
|
|
||||||
5. `docs: required/astérisque + lowercase email (COMPONENTS + CHANGELOG)`
|
|
||||||
6. `docs(playground): exemples required + email lowercase` (optionnel)
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
# MalioDateTime — Design (version intérimaire)
|
|
||||||
|
|
||||||
**Date :** 2026-05-22
|
|
||||||
**Ticket :** #MUI-33 (famille Datepicker)
|
|
||||||
**Statut :** validé, prêt pour le plan d'implémentation
|
|
||||||
|
|
||||||
## Objectif
|
|
||||||
|
|
||||||
Ajouter un composant `MalioDateTime` à la famille temporelle de `@malio/layer-ui`, permettant de saisir **une date ET une heure** dans un seul champ avec popover.
|
|
||||||
|
|
||||||
Cette version est **intérimaire** : le sélecteur d'heure utilise un `<input type="time">` natif, le temps que la maquette du sélecteur d'heure dédié soit fournie. Le bloc heure est volontairement isolé pour pouvoir être remplacé sans toucher au reste.
|
|
||||||
|
|
||||||
## Valeur du modèle
|
|
||||||
|
|
||||||
`modelValue: string | null` au format **ISO naïf sans fuseau** : `"YYYY-MM-DDTHH:MM:00"` (ex. `"2026-05-20T14:30:00"`).
|
|
||||||
|
|
||||||
- Heure murale locale : un picker n'a pas de notion de fuseau.
|
|
||||||
- Symfony (`DateTimeNormalizer`, RFC 3339) parse ce format et applique son fuseau configuré → zéro bug TZ/DST côté front.
|
|
||||||
- Les secondes sont toujours `00` (le natif `type="time"` par défaut n'expose pas les secondes).
|
|
||||||
- Cohérent avec `MalioDate` (`YYYY-MM-DD`) et `MalioTime` (`HH:MM`).
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
Fine enveloppe autour du shell partagé `internal/CalendarField.vue`, comme `MalioDate` / `MalioDateRange` / `MalioDateWeek`.
|
|
||||||
|
|
||||||
```
|
|
||||||
MalioDateTime (Date/DateTime.vue)
|
|
||||||
└─ CalendarField (champ + popover + header + navigation mois)
|
|
||||||
slot #default={ currentMonth, currentYear, close }
|
|
||||||
├─ MonthGrid (sélection du jour)
|
|
||||||
└─ <input type="time"> (sélection de l'heure, sous la grille)
|
|
||||||
```
|
|
||||||
|
|
||||||
Le `close` du slot n'est **pas** appelé sur sélection (contrairement à `MalioDate`) : on a besoin de date ET heure, la fermeture se fait au clic extérieur (déjà gérée par `CalendarField` via `useCalendarPopover`).
|
|
||||||
|
|
||||||
## Props
|
|
||||||
|
|
||||||
Identiques à `MalioDate` :
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Note |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `id` | `string` | `''` | |
|
|
||||||
| `name` | `string` | `''` | |
|
|
||||||
| `label` | `string` | `''` | |
|
|
||||||
| `modelValue` | `string \| null` | `undefined` | `"YYYY-MM-DDTHH:MM:00"` |
|
|
||||||
| `placeholder` | `string` | `'JJ/MM/AAAA HH:MM'` | |
|
|
||||||
| `required` | `boolean` | `false` | |
|
|
||||||
| `disabled` | `boolean` | `false` | |
|
|
||||||
| `readonly` | `boolean` | `false` | |
|
|
||||||
| `hint` | `string` | `''` | |
|
|
||||||
| `error` | `string` | `''` | |
|
|
||||||
| `success` | `string` | `''` | |
|
|
||||||
| `min` | `string` | `undefined` | datetime ou date ; on borne la grille avec la partie date |
|
|
||||||
| `max` | `string` | `undefined` | idem |
|
|
||||||
| `clearable` | `boolean` | `true` | |
|
|
||||||
| `inputClass` / `labelClass` / `groupClass` | `string` | `''` | |
|
|
||||||
|
|
||||||
**Émissions :** `update:modelValue: string | null`.
|
|
||||||
|
|
||||||
## Affichage du champ
|
|
||||||
|
|
||||||
`displayValue` = `formatIsoDateTimeToDisplay(modelValue)` → `"JJ/MM/AAAA HH:MM"` (ex. `20/05/2026 14:30`). Chaîne vide si `modelValue` nul ou invalide.
|
|
||||||
|
|
||||||
## Flux de sélection
|
|
||||||
|
|
||||||
État : `modelValue` est la source de vérité. Une ref locale `pendingTime: string` (`'HH:MM'` ou `''`) sert de pont quand l'heure est réglée avant qu'un jour soit choisi.
|
|
||||||
|
|
||||||
- **Partie date courante** = `splitDateTime(modelValue).date` (ou `null`).
|
|
||||||
- **Valeur de l'`<input type="time">`** = `splitDateTime(modelValue).time` si présent, sinon `pendingTime`.
|
|
||||||
|
|
||||||
Interactions :
|
|
||||||
|
|
||||||
1. **Clic sur un jour `iso`** :
|
|
||||||
- `heureEffective` = partie heure de `modelValue`, sinon `pendingTime`, sinon `'00:00'`.
|
|
||||||
- émet `composeDateTime(iso, heureEffective)` → `"iso T heure:00"`.
|
|
||||||
- le popover **reste ouvert**.
|
|
||||||
2. **Changement de l'`<input type="time">` (`hhmm`)** :
|
|
||||||
- si une partie date existe → émet `composeDateTime(datePart, hhmm)`.
|
|
||||||
- sinon → stocke `hhmm` dans `pendingTime` (pas d'émission tant qu'aucun jour n'est choisi).
|
|
||||||
- si `hhmm` est vidé (`''`) et qu'une date existe → on garde la date avec `00:00` ? **Non** : on n'émet rien sur vidage, on conserve la dernière valeur émise (le natif renvoie rarement `''` une fois rempli ; cas négligé pour l'intérim).
|
|
||||||
3. **Effacer (croix)** : émet `null`, `pendingTime = ''`.
|
|
||||||
|
|
||||||
Bornes `min`/`max` : passées à `MonthGrid` après slice de la partie date (`min?.slice(0, 10)`). Pas de borne sur l'heure dans cette version.
|
|
||||||
|
|
||||||
## Composable `composables/datetimeFormat.ts`
|
|
||||||
|
|
||||||
Réutilise `isValidIso` de `dateFormat.ts` pour valider la partie date.
|
|
||||||
|
|
||||||
```ts
|
|
||||||
// "YYYY-MM-DDTHH:MM:00" complet et valide ?
|
|
||||||
export function isValidIsoDateTime(s: string): boolean
|
|
||||||
|
|
||||||
// "YYYY-MM-DDTHH:MM:00" -> "JJ/MM/AAAA HH:MM" (chaîne vide si invalide/nul)
|
|
||||||
export function formatIsoDateTimeToDisplay(s: string | null): string
|
|
||||||
|
|
||||||
// "YYYY-MM-DDTHH:MM:00" -> { date: "YYYY-MM-DD" | null, time: "HH:MM" | '' }
|
|
||||||
export function splitDateTime(s: string | null): { date: string | null; time: string }
|
|
||||||
|
|
||||||
// (date "YYYY-MM-DD", time "HH:MM") -> "YYYY-MM-DDTHH:MM:00"
|
|
||||||
export function composeDateTime(date: string, time: string): string
|
|
||||||
```
|
|
||||||
|
|
||||||
Règles :
|
|
||||||
- `isValidIsoDateTime` : regex `^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$`, partie date valide via `isValidIso`, heure `00–23`, minutes `00–59`, secondes `00–59`.
|
|
||||||
- `splitDateTime` : si `s` nul ou ne matche pas le motif datetime → `{ date: null, time: '' }`. Sinon découpe sur `T`, renvoie la date et `HH:MM` (5 premiers car. de la partie heure).
|
|
||||||
- `composeDateTime(date, time)` : `${date}T${time}:00`. Si `time` vide → `${date}T00:00:00`.
|
|
||||||
- `formatIsoDateTimeToDisplay` : si `!isValidIsoDateTime` → `''`. Sinon `${dd}/${mm}/${yyyy} ${hh}:${min}`.
|
|
||||||
|
|
||||||
## Tests
|
|
||||||
|
|
||||||
Colocalisés, Vitest + @vue/test-utils (jsdom), `vi.setSystemTime(new Date(2026, 4, 19))` pour déterminisme.
|
|
||||||
|
|
||||||
**`datetimeFormat.test.ts`** (helpers purs) :
|
|
||||||
- `isValidIsoDateTime` : accepte `"2026-05-20T14:30:00"` ; rejette `"2026-05-20"`, `"2026-13-01T00:00:00"`, `"2026-05-20T24:00:00"`, `"2026-05-20T14:60:00"`, `""`, format sans secondes.
|
|
||||||
- `formatIsoDateTimeToDisplay` : `"2026-05-20T14:30:00"` → `"20/05/2026 14:30"` ; nul/invalide → `''`.
|
|
||||||
- `splitDateTime` : `"2026-05-20T14:30:00"` → `{ date: "2026-05-20", time: "14:30" }` ; `null` → `{ date: null, time: '' }` ; `"2026-05-20"` (date seule, non datetime) → `{ date: null, time: '' }`.
|
|
||||||
- `composeDateTime` : `("2026-05-20", "14:30")` → `"2026-05-20T14:30:00"` ; `("2026-05-20", "")` → `"2026-05-20T00:00:00"`.
|
|
||||||
|
|
||||||
**`DateTime.test.ts`** (composant) :
|
|
||||||
- Rendu : champ présent, placeholder `JJ/MM/AAAA HH:MM`, `displayValue` correct quand `modelValue` fourni.
|
|
||||||
- Ouverture popover au clic → `MonthGrid` + `input[type=time]` visibles.
|
|
||||||
- Clic sur un jour sans heure → émet `"<iso>T00:00:00"`, popover reste ouvert.
|
|
||||||
- Clic sur un jour avec `pendingTime` réglé d'abord → émet `"<iso>T<pendingTime>:00"`.
|
|
||||||
- Changement de l'heure avec date déjà choisie → émet `"<date>T<nouvelleHeure>:00"`.
|
|
||||||
- Changement de l'heure sans date → **aucune émission**.
|
|
||||||
- `clearable` : croix émet `null`.
|
|
||||||
- `min`/`max` datetime → jours hors bornes désactivés dans la grille.
|
|
||||||
- Accessibilité : label lié, `aria-invalid` sur erreur.
|
|
||||||
|
|
||||||
## Livrables
|
|
||||||
|
|
||||||
1. `app/components/malio/date/composables/datetimeFormat.ts`
|
|
||||||
2. `app/components/malio/date/composables/datetimeFormat.test.ts`
|
|
||||||
3. `app/components/malio/date/DateTime.vue`
|
|
||||||
4. `app/components/malio/date/DateTime.test.ts`
|
|
||||||
5. Page playground `.playground/pages/composant/date/datetime.vue` + entrée nav (`playground.nav.ts`)
|
|
||||||
6. Story `app/story/date/dateTime.story.vue`
|
|
||||||
7. `COMPONENTS.md` (section MalioDateTime)
|
|
||||||
8. `CHANGELOG.md` (ligne sous `### Added`)
|
|
||||||
|
|
||||||
## Hors périmètre (intérim)
|
|
||||||
|
|
||||||
- Sélecteur d'heure dédié / maquette → itération ultérieure ; on remplacera le bloc `<input type="time">` isolé.
|
|
||||||
- Bornes horaires (min/max sur l'heure).
|
|
||||||
- Pas de minutes configurable (granularité native du navigateur).
|
|
||||||
- Secondes dans l'UI.
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
# Spec — Composant Accordéon `<MalioAccordion>`
|
|
||||||
|
|
||||||
**Date :** 2026-05-26
|
|
||||||
**Ticket :** MUI-37
|
|
||||||
**Statut :** Validé (design), prêt pour planification
|
|
||||||
|
|
||||||
## Contexte & objectif
|
|
||||||
|
|
||||||
Ajouter un composant accordéon à `@malio/layer-ui`. Cas d'usage principal :
|
|
||||||
un **système de filtres dans un drawer** d'ERP, où plusieurs sections de
|
|
||||||
critères (prix, catégorie, marque…) doivent pouvoir être dépliées
|
|
||||||
simultanément, chaque section ayant un contenu hétérogène (checkboxes,
|
|
||||||
slider, recherche…).
|
|
||||||
|
|
||||||
## Décision d'API : composants enfants (compositional)
|
|
||||||
|
|
||||||
Plutôt que l'API « tableau `items` + slots » de NuxtUI (qui impose un template
|
|
||||||
`#content` unique avec un switch central sur l'item courant), on adopte une
|
|
||||||
**API compositionnelle** : un parent `<MalioAccordion>` qui enveloppe des
|
|
||||||
enfants `<MalioAccordionItem>`. Chaque section déclare son titre **et** son
|
|
||||||
contenu au même endroit, sans switch central, et s'ajoute/se retire
|
|
||||||
indépendamment.
|
|
||||||
|
|
||||||
Rationale : pour des filtres au contenu hétérogène, c'est nettement plus
|
|
||||||
lisible et évolutif. On reste **100 % natif** (pas de dépendance Reka UI,
|
|
||||||
contrairement à NuxtUI), cohérent avec le `TabList` maison et les conventions
|
|
||||||
du layer (`@iconify/vue`, `twMerge`, props `*Class`).
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
```
|
|
||||||
MalioAccordion (parent : état d'ouverture, mode, coordination)
|
|
||||||
└─ MalioAccordionItem (enfant : en-tête cliquable + panneau animé + slot)
|
|
||||||
```
|
|
||||||
|
|
||||||
Le parent **fournit** (`provide`) un contexte d'accordéon ; chaque enfant
|
|
||||||
**l'injecte** (`inject`) pour connaître son état d'ouverture et déclencher les
|
|
||||||
bascules. Communication via une clé `Symbol` (`InjectionKey`).
|
|
||||||
|
|
||||||
**Contexte fourni** (forme indicative) :
|
|
||||||
|
|
||||||
```ts
|
|
||||||
interface AccordionContext {
|
|
||||||
mode: ComputedRef<'single' | 'multiple'>
|
|
||||||
isOpen: (value: string) => boolean
|
|
||||||
toggle: (value: string) => void
|
|
||||||
register: (value: string, defaultOpen: boolean) => void // enfant → parent au montage
|
|
||||||
unregister: (value: string) => void
|
|
||||||
baseId: string // pour générer les ids ARIA
|
|
||||||
registerHeader / focus nav helpers // pour la navigation flèches
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Fichiers :**
|
|
||||||
|
|
||||||
```
|
|
||||||
app/components/malio/accordion/Accordion.vue
|
|
||||||
app/components/malio/accordion/AccordionItem.vue
|
|
||||||
app/components/malio/accordion/Accordion.test.ts
|
|
||||||
app/components/malio/accordion/AccordionItem.test.ts
|
|
||||||
```
|
|
||||||
|
|
||||||
(+ page playground et story Histoire, cf. skill `creating-malio-component`.)
|
|
||||||
|
|
||||||
## API publique
|
|
||||||
|
|
||||||
### `<MalioAccordion>`
|
|
||||||
|
|
||||||
`defineOptions({ name: 'MalioAccordion', inheritAttrs: false })`
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Rôle |
|
|
||||||
|------|------|--------|------|
|
|
||||||
| `mode` | `'single' \| 'multiple'` | `'multiple'` | Un seul ou plusieurs panneaux ouverts |
|
|
||||||
| `modelValue` | `string \| string[]` | `undefined` | v-model des clés ouvertes (`string` en `single`, `string[]` en `multiple`) |
|
|
||||||
| `id` | `string` | auto (`useId`) | Base d'id pour les attributs ARIA |
|
|
||||||
| `groupClass` | `string` | `''` | Classes du conteneur (fusion `twMerge`) |
|
|
||||||
|
|
||||||
**Events :** `update:modelValue(value: string | string[])`
|
|
||||||
|
|
||||||
**Pattern contrôlé / non-contrôlé** (convention maison) :
|
|
||||||
`isControlled = computed(() => props.modelValue !== undefined)`, avec
|
|
||||||
`localValue` en fallback. En non-contrôlé, l'état initial est dérivé des
|
|
||||||
enfants ayant `defaultOpen`.
|
|
||||||
|
|
||||||
### `<MalioAccordionItem>`
|
|
||||||
|
|
||||||
`defineOptions({ name: 'MalioAccordionItem', inheritAttrs: false })`
|
|
||||||
|
|
||||||
| Prop | Type | Défaut | Rôle |
|
|
||||||
|------|------|--------|------|
|
|
||||||
| `title` | `string` | — | Texte de l'en-tête |
|
|
||||||
| `value` | `string` | auto (`useId`) | Clé unique (recommandée pour piloter le v-model) |
|
|
||||||
| `defaultOpen` | `boolean` | `false` | Ouvert au montage (mode non-contrôlé) |
|
|
||||||
| `disabled` | `boolean` | `false` | En-tête non cliquable |
|
|
||||||
| `headerClass` | `string` | `''` | Override classes de l'en-tête (`twMerge`) |
|
|
||||||
| `panelClass` | `string` | `''` | Override classes du panneau (`twMerge`) |
|
|
||||||
|
|
||||||
**Slot par défaut** = contenu du panneau.
|
|
||||||
|
|
||||||
## Comportement : mode `single` vs `multiple`
|
|
||||||
|
|
||||||
- **`multiple`** (défaut) : `modelValue` est un `string[]`. Basculer une
|
|
||||||
section ajoute/retire sa clé du tableau, sans affecter les autres.
|
|
||||||
- **`single`** : `modelValue` est un `string` (clé ouverte, ou `''`/`undefined`
|
|
||||||
si tout fermé). Ouvrir une section ferme la précédente.
|
|
||||||
|
|
||||||
L'en-tête minimal : **titre + chevron animé** uniquement. Pas de badge, pas
|
|
||||||
d'icône leading, pas de slot d'en-tête custom dans cette version (extensible
|
|
||||||
plus tard si besoin métier).
|
|
||||||
|
|
||||||
## Animation & rendu
|
|
||||||
|
|
||||||
- **Ouverture/fermeture** : transition de hauteur via
|
|
||||||
`grid-template-rows: 0fr → 1fr` sur un wrapper en `overflow: hidden`
|
|
||||||
(gère la hauteur dynamique du contenu sans mesure JS).
|
|
||||||
- **Chevron** : `mdi:chevron-down` via `@iconify/vue`, rotation 180° en
|
|
||||||
transition synchronisée avec l'ouverture.
|
|
||||||
- **Tokens Malio** : séparateurs `border-m-border`, titre `text-m-text`,
|
|
||||||
`rounded-malio` au besoin. Tout surchargeable via `headerClass` / `panelClass`
|
|
||||||
fusionnés avec `twMerge()`.
|
|
||||||
|
|
||||||
## Accessibilité (WAI-ARIA Accordion Pattern)
|
|
||||||
|
|
||||||
- En-tête = vrai `<button type="button">` → focusable nativement,
|
|
||||||
Entrée/Espace pour basculer.
|
|
||||||
- `aria-expanded` sur le bouton, `aria-controls` → id du panneau.
|
|
||||||
- Panneau : `role="region"` + `aria-labelledby` → id du bouton.
|
|
||||||
- Sections désactivées : `disabled` + `aria-disabled` sur le bouton.
|
|
||||||
- **Navigation clavier ↑/↓** entre les en-têtes (déplacement du focus d'un
|
|
||||||
en-tête à l'autre), conformément au pattern WAI-ARIA. `Home`/`End`
|
|
||||||
optionnels (nice-to-have).
|
|
||||||
|
|
||||||
## Tests (Vitest + @vue/test-utils, jsdom)
|
|
||||||
|
|
||||||
Helper `mountComponent(props)` colocalisé. Couverture cible :
|
|
||||||
|
|
||||||
**Accordion.test.ts**
|
|
||||||
- Rendu des enfants (slots).
|
|
||||||
- Mode `multiple` : plusieurs sections ouvertes simultanément.
|
|
||||||
- Mode `single` : ouvrir une section ferme la précédente.
|
|
||||||
- v-model contrôlé : `modelValue` pilote l'état ; émission de `update:modelValue`.
|
|
||||||
- Non-contrôlé : `defaultOpen` sur enfants → état initial correct.
|
|
||||||
|
|
||||||
**AccordionItem.test.ts**
|
|
||||||
- Toggle au clic sur l'en-tête.
|
|
||||||
- `disabled` : clic sans effet, attributs `disabled` / `aria-disabled`.
|
|
||||||
- Attributs ARIA : `aria-expanded`, `aria-controls`, `role="region"`,
|
|
||||||
`aria-labelledby` correctement liés.
|
|
||||||
- Navigation clavier ↑/↓ entre en-têtes.
|
|
||||||
- Override de classes via `headerClass` / `panelClass`.
|
|
||||||
|
|
||||||
## Livrables documentaires (convention maison)
|
|
||||||
|
|
||||||
- Mise à jour de `COMPONENTS.md` (tableau de props + exemples).
|
|
||||||
- Mise à jour de `CHANGELOG.md`.
|
|
||||||
- Page playground (ajout à `playground.nav.ts`).
|
|
||||||
- Story Histoire (`app/story/accordion/`).
|
|
||||||
|
|
||||||
## Hors périmètre (YAGNI, V1)
|
|
||||||
|
|
||||||
- Badge / compteur de filtres actifs dans l'en-tête.
|
|
||||||
- Icône leading.
|
|
||||||
- Slot d'en-tête personnalisé.
|
|
||||||
- Persistance d'état (localStorage, URL).
|
|
||||||
|
|
||||||
Ces éléments pourront être ajoutés ultérieurement si un besoin métier concret
|
|
||||||
émerge, sans casser l'API.
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user