From fdd263c1c7abb807d66a5075a26a5ad7bc00d042 Mon Sep 17 00:00:00 2001 From: agarrone Date: Fri, 13 Nov 2026 15:27:47 +0100 Subject: [PATCH 01/26] fix(tags): harmonize compact interactive states --- assets/css/overrides.css | 114 ++++++++++++++++++ .../SuiviDePublication/HvdStatutBadge.vue | 9 +- components/TagsSelect.vue | 3 + pages/datasets/[did].vue | 1 + tests/datasets/[did].spec.ts | 22 ++++ tests/datasets/creation.spec.ts | 10 ++ .../donnees-de-forte-valeur.spec.ts | 17 +++ 7 files changed, 173 insertions(+), 3 deletions(-) diff --git a/assets/css/overrides.css b/assets/css/overrides.css index fb92c7d30..0b9e05acd 100644 --- a/assets/css/overrides.css +++ b/assets/css/overrides.css @@ -34,6 +34,120 @@ @apply w-10 leading-0 text-lg; } +/* + * Compact tags and interaction states owned by cdata. + * + * DSFR interactive tags are blue at rest by default. In cdata they stay neutral + * until hover/focus, while selected and dismissible values keep a stable blue. + */ +.fr-tag { + font-size: 0.75rem; + line-height: 1.25rem; + min-height: 1.5rem; + padding: 0.125rem 0.5rem; + border-radius: 0.75rem; +} + +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]) { + color: var(--text-label-grey); + background-color: var(--background-contrast-grey); + --hover: var(--background-action-low-blue-france); + --active: var(--background-action-low-blue-france-active); +} + +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):focus-visible { + color: var(--text-action-high-blue-france); + background-color: var(--background-action-low-blue-france); + outline: 2px solid var(--border-active-blue-france); + outline-offset: 2px; +} + +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):is(:hover, :active) { + color: var(--text-action-high-blue-france); +} + +:is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled) { + color: var(--text-inverted-blue-france); + background-color: var(--background-action-high-blue-france); + --hover: var(--background-action-high-blue-france); + --active: var(--background-action-high-blue-france-active); +} + +:is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled):focus-visible { + outline: 2px solid var(--border-active-blue-france); + outline-offset: 2px; +} + +:is(button, input[type="button"]).fr-tag[aria-pressed="true"]:not(:disabled), +:is(button, input[type="button"]).fr-tag[aria-pressed="true"]:not(:disabled):hover { + background-image: radial-gradient(circle at 100% 0.1875rem, transparent 0.4475rem, var(--background-active-blue-france) 0.5rem); +} + +:is(button, input[type="button"]).fr-tag:disabled { + color: var(--text-disabled-grey); + background-color: var(--background-disabled-grey); + --hover: var(--background-disabled-grey); + --active: var(--background-disabled-grey); +} + +/* + * DatasetLabelTag belongs to @datagouv/components-next. The consumer class keeps + * cdata's linked instance neutral at rest and preserves the SVG's native pixels. + * `!important` is required because the package ships Tailwind in important mode. + */ +.cdata-dataset-label-tag { + min-height: 1.5rem; + color: var(--text-label-grey) !important; + background-color: var(--background-contrast-grey) !important; + gap: 0.125rem !important; +} + +a.cdata-dataset-label-tag:hover, +a.cdata-dataset-label-tag:focus-visible { + color: var(--text-action-high-blue-france) !important; + background-color: var(--background-action-low-blue-france) !important; +} + +a.cdata-dataset-label-tag:active { + background-color: var(--background-action-low-blue-france-active) !important; +} + +a.cdata-dataset-label-tag:focus-visible { + outline: 2px solid var(--border-active-blue-france); + outline-offset: 2px; +} + +.cdata-dataset-label-tag > img { + background-color: transparent !important; + border-radius: 0 !important; +} + +/* The business badge keeps its semantic colour; only its label is underlined. */ +.hvd-status-badge-link { + display: inline-flex; + border-radius: 0.25rem; + background-color: transparent !important; + --hover-tint: transparent; + --active-tint: transparent; +} + +.hvd-status-badge-link:hover, +.hvd-status-badge-link:active, +.hvd-status-badge-link:focus-visible { + background-color: transparent !important; +} + +.hvd-status-badge-link:hover > span > span { + text-decoration-line: underline; + text-decoration-thickness: 1px; + text-underline-offset: 2px; +} + +.hvd-status-badge-link:focus-visible { + outline: 2px solid var(--border-active-blue-france); + outline-offset: 2px; +} + /* Breadcrumb placed on a coloured hero background (OnboardingHero, EditoHeader). Links inherit the container colour and the separator chevrons use currentColor, so a single white colour covers the whole breadcrumb. The hero owns the diff --git a/components/SuiviDePublication/HvdStatutBadge.vue b/components/SuiviDePublication/HvdStatutBadge.vue index be88c1eb2..495146e87 100644 --- a/components/SuiviDePublication/HvdStatutBadge.vue +++ b/components/SuiviDePublication/HvdStatutBadge.vue @@ -5,15 +5,16 @@ :to="url" external target="_blank" - rel="noopener" - class="no-underline fr-raw-link" + rel="noopener noreferrer" + :aria-label="`${statut} — ${t('Voir les données (nouvel onglet)')}`" + class="hvd-status-badge-link no-underline fr-raw-link" > {{ statut }} @@ -34,6 +35,8 @@ import CdataLink from '~/components/CdataLink.vue' import AdminBadge from '~/components/AdminBadge/AdminBadge.vue' import type { AdminBadgeType } from '~/types/types' +const { t } = useTranslation() + // Presentation only: the status → colour / links-to-data mapping is owned by the // hosting page (single source of truth in its STATUTS list) and passed in. defineProps<{ diff --git a/components/TagsSelect.vue b/components/TagsSelect.vue index 9000d78a6..85beebb96 100644 --- a/components/TagsSelect.vue +++ b/components/TagsSelect.vue @@ -20,11 +20,14 @@
diff --git a/tests/datasets/[did].spec.ts b/tests/datasets/[did].spec.ts index a0ea11e65..32f3bf385 100644 --- a/tests/datasets/[did].spec.ts +++ b/tests/datasets/[did].spec.ts @@ -27,12 +27,34 @@ test('dataset with labels shows label section', async ({ page }) => { // Check that labels are clickable links await expect(labelsList.locator('a')).toHaveCount(1) + const label = labelsList.locator('a').first() + await expect(label).toHaveCSS('font-size', '12px') + await expect(label).toHaveCSS('min-height', '24px') + await expect(label.locator('img')).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)') + // The label text comes from the badge reference list, which the page only // fetches for datasets that carry badges: a link with an empty label means // that list was not loaded. await expect(labelsList.locator('a')).toHaveText(/Service public de la donnée/) }) +test('linked dataset labels are neutral at rest and blue on hover and focus', async ({ page }) => { + await page.goto( + '/datasets/base-sirene-des-entreprises-et-de-leurs-etablissements-siren-siret/', + ) + + const label = page.getByTestId('label-list').locator('a').first() + const restBackground = await label.evaluate(element => getComputedStyle(element).backgroundColor) + await label.hover() + const hoverBackground = await label.evaluate(element => getComputedStyle(element).backgroundColor) + expect(hoverBackground).not.toBe(restBackground) + + await label.focus() + await expect(label).toBeFocused() + await expect(label).toHaveCSS('outline-style', 'solid') + await expect(label).toHaveCSS('outline-width', '2px') +}) + test('dataset labels have proper tooltips and information', async ({ page, }) => { diff --git a/tests/datasets/creation.spec.ts b/tests/datasets/creation.spec.ts index d956815cb..7ea0ba918 100644 --- a/tests/datasets/creation.spec.ts +++ b/tests/datasets/creation.spec.ts @@ -129,6 +129,16 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t await page.getByPlaceholder('Chercher un mot clé…').fill('toto') await page.getByRole('option', { name: 'toto' }).click() await clickOutside(page) + const selectedTags = page.getByTestId('selected-tags') + await expect(selectedTags.getByRole('button')).toHaveCount(2) + await expect(selectedTags.getByRole('button')).toHaveText(['test', 'toto']) + await expect(selectedTags.getByRole('button').first()).toHaveCSS('font-size', '12px') + await expect(selectedTags.getByRole('button').first()).toHaveCSS('min-height', '24px') + + // A selected keyword is also dismissible: removing it must keep the model in sync. + await page.getByRole('button', { name: 'Supprimer le mot-clé test' }).click() + await expect(selectedTags.getByRole('button')).toHaveCount(1) + await expect(selectedTags.getByRole('button')).toHaveText(['toto']) await page.getByTestId('searchable-select-licence').click() await page.getByText('Other (Public Domain)').click() await clickOutside(page) diff --git a/tests/suivi-de-publication/donnees-de-forte-valeur.spec.ts b/tests/suivi-de-publication/donnees-de-forte-valeur.spec.ts index 1d29a420a..a7801ae7a 100644 --- a/tests/suivi-de-publication/donnees-de-forte-valeur.spec.ts +++ b/tests/suivi-de-publication/donnees-de-forte-valeur.spec.ts @@ -116,6 +116,23 @@ test('links the status badges to the published data', async ({ page }) => { // "Disponible sur data.gouv.fr" links to the dataset url. const telechargementLink = zebreRow.locator('td').nth(5).getByRole('link') await expect(telechargementLink).toHaveAttribute('href', 'https://www.data.gouv.fr/datasets/zebre') + await expect(telechargementLink).toHaveAttribute('target', '_blank') + await expect(telechargementLink).toHaveAttribute('rel', 'noopener noreferrer') + await expect(telechargementLink).toHaveAccessibleName('Disponible sur data.gouv.fr — Voir les données (nouvel onglet)') + await expect(telechargementLink.locator('svg')).toHaveCount(1) + await expect(telechargementLink).not.toContainText('Voir les données') + + const badge = telechargementLink.locator(':scope > span') + const badgeLabel = badge.locator(':scope > span') + const badgeBackground = await badge.evaluate(element => getComputedStyle(element).backgroundColor) + await telechargementLink.hover() + await expect(telechargementLink).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)') + await expect(badge).toHaveCSS('background-color', badgeBackground) + await expect(badgeLabel).toHaveCSS('text-decoration-line', 'underline') + + await telechargementLink.focus() + await expect(telechargementLink).toBeFocused() + await expect(telechargementLink).toHaveCSS('outline-width', '2px') // "Non disponible" has no url and is not a link. await expect(zebreRow.locator('td').nth(6).getByRole('link')).toHaveCount(0) await expect(zebreRow.locator('td').nth(6)).toContainText('Non disponible') From 5a24ceea5a8647c2359800390059072d373a918b Mon Sep 17 00:00:00 2001 From: agarrone Date: Fri, 13 Nov 2026 22:23:23 +0100 Subject: [PATCH 02/26] docs(design): add tags and labels gallery --- assets/css/overrides.css | 56 +++++--- components/TagsSelect.vue | 7 +- pages/design.vue | 9 +- pages/design/cards.vue | 5 +- pages/design/tags.vue | 192 +++++++++++++++++++++++++++ tests/design-tags.logged-out.spec.ts | 61 +++++++++ 6 files changed, 305 insertions(+), 25 deletions(-) create mode 100644 pages/design/tags.vue create mode 100644 tests/design-tags.logged-out.spec.ts diff --git a/assets/css/overrides.css b/assets/css/overrides.css index 0b9e05acd..d4702fcf2 100644 --- a/assets/css/overrides.css +++ b/assets/css/overrides.css @@ -53,6 +53,8 @@ background-color: var(--background-contrast-grey); --hover: var(--background-action-low-blue-france); --active: var(--background-action-low-blue-france-active); + --hover-tint: var(--background-action-low-blue-france); + --active-tint: var(--background-action-low-blue-france-active); } :is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):focus-visible { @@ -66,11 +68,21 @@ color: var(--text-action-high-blue-france); } +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):hover { + background-color: var(--background-action-low-blue-france) !important; +} + +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):active { + background-color: var(--background-action-low-blue-france-active) !important; +} + :is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled) { color: var(--text-inverted-blue-france); background-color: var(--background-action-high-blue-france); --hover: var(--background-action-high-blue-france); --active: var(--background-action-high-blue-france-active); + --hover-tint: var(--background-action-high-blue-france); + --active-tint: var(--background-action-high-blue-france-active); } :is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled):focus-visible { @@ -88,6 +100,8 @@ background-color: var(--background-disabled-grey); --hover: var(--background-disabled-grey); --active: var(--background-disabled-grey); + --hover-tint: var(--background-disabled-grey); + --active-tint: var(--background-disabled-grey); } /* @@ -95,21 +109,28 @@ * cdata's linked instance neutral at rest and preserves the SVG's native pixels. * `!important` is required because the package ships Tailwind in important mode. */ -.cdata-dataset-label-tag { - min-height: 1.5rem; - color: var(--text-label-grey) !important; - background-color: var(--background-contrast-grey) !important; - gap: 0.125rem !important; -} - -a.cdata-dataset-label-tag:hover, -a.cdata-dataset-label-tag:focus-visible { - color: var(--text-action-high-blue-france) !important; - background-color: var(--background-action-low-blue-france) !important; -} - -a.cdata-dataset-label-tag:active { - background-color: var(--background-action-low-blue-france-active) !important; +@layer utilities { + .cdata-dataset-label-tag { + min-height: 1.5rem; + color: var(--text-label-grey) !important; + background-color: var(--background-contrast-grey) !important; + gap: 0.125rem !important; + } + + a.cdata-dataset-label-tag:hover, + a.cdata-dataset-label-tag:focus-visible { + color: var(--text-action-high-blue-france) !important; + background-color: var(--background-action-low-blue-france) !important; + } + + a.cdata-dataset-label-tag:active { + background-color: var(--background-action-low-blue-france-active) !important; + } + + .datagouv-components .cdata-dataset-label-tag > img.bg-white { + background-color: transparent !important; + border-radius: 0 !important; + } } a.cdata-dataset-label-tag:focus-visible { @@ -117,11 +138,6 @@ a.cdata-dataset-label-tag:focus-visible { outline-offset: 2px; } -.cdata-dataset-label-tag > img { - background-color: transparent !important; - border-radius: 0 !important; -} - /* The business badge keeps its semantic colour; only its label is underlined. */ .hvd-status-badge-link { display: inline-flex; diff --git a/components/TagsSelect.vue b/components/TagsSelect.vue index 85beebb96..6d1c54700 100644 --- a/components/TagsSelect.vue +++ b/components/TagsSelect.vue @@ -6,7 +6,7 @@ :placeholder="t('Chercher un mot clé…')" :get-option-id="(tag: Tag) => tag.text" :allow-new-option="toTag" - :suggest="suggestTags" + :suggest :multiple="true" class="!mb-0" @@ -41,9 +41,10 @@ import { SearchableSelect } from '@datagouv/components-next' import type { Tag } from '~/types/types' -defineProps<{ +const props = defineProps<{ errorText?: string | null warningText?: string | null + suggest?: (query: string) => Promise> }>() const tags = defineModel>({ required: true }) @@ -58,6 +59,8 @@ async function suggestTags(query: string) { }, }) } + +const suggest = computed(() => props.suggest ?? suggestTags) function removeTag(tag: Tag) { tags.value = tags.value.filter(otherTag => otherTag.text !== tag.text) } diff --git a/pages/design.vue b/pages/design.vue index 8078eddb4..f3f4a4e15 100644 --- a/pages/design.vue +++ b/pages/design.vue @@ -28,6 +28,11 @@ :label="$t('Boutons')" to="/design/buttons" /> + diff --git a/tests/design-tags.logged-out.spec.ts b/tests/design-tags.logged-out.spec.ts new file mode 100644 index 000000000..3fc4b1a86 --- /dev/null +++ b/tests/design-tags.logged-out.spec.ts @@ -0,0 +1,61 @@ +import { expect, test } from './base' +import { gotoHydrated } from './helpers' + +test.beforeEach(async ({ page }) => { + await gotoHydrated(page, '/design/tags') +}) + +test('shows every compact tag state', async ({ page }) => { + const staticTag = page.getByTestId('static-tag') + const clickableTag = page.getByTestId('clickable-tag') + const selectableTag = page.getByTestId('selectable-tag') + const disabledTag = page.getByTestId('disabled-tag') + + for (const tag of [staticTag, clickableTag, selectableTag, disabledTag]) { + await expect(tag).toHaveCSS('font-size', '12px') + await expect(tag).toHaveCSS('min-height', '24px') + } + + const restBackground = await clickableTag.evaluate(element => getComputedStyle(element).backgroundColor) + await clickableTag.hover() + await expect(clickableTag).not.toHaveCSS('background-color', restBackground) + await clickableTag.focus() + await expect(clickableTag).toHaveCSS('outline-style', 'solid') + + await selectableTag.click() + await expect(selectableTag).toHaveAttribute('aria-pressed', 'true') + const selectedBackground = await selectableTag.evaluate(element => getComputedStyle(element).backgroundColor) + await selectableTag.hover() + await expect(selectableTag).toHaveCSS('background-color', selectedBackground) + + const disabledBackground = await disabledTag.evaluate(element => getComputedStyle(element).backgroundColor) + await disabledTag.hover() + await expect(disabledTag).toHaveCSS('background-color', disabledBackground) +}) + +test('shows and removes multiple TagsSelect values', async ({ page }) => { + const selectedTags = page.getByTestId('selected-tags') + await expect(selectedTags.getByRole('button')).toHaveCount(3) + await expect(selectedTags.getByRole('button').first()).toHaveCSS('font-size', '12px') + await expect(selectedTags.getByRole('button').first()).toHaveCSS('min-height', '24px') + + await page.getByRole('button', { name: 'Supprimer le mot-clé transport' }).click() + await expect(selectedTags.getByRole('button')).toHaveCount(2) + await expect(selectedTags).not.toContainText('transport') +}) + +test('shows DatasetLabelTag with and without a link', async ({ page }) => { + const staticLabel = page.getByTestId('dataset-label-static') + const linkedLabel = page.getByTestId('dataset-label-link') + + await expect(staticLabel).not.toHaveAttribute('href') + await expect(linkedLabel).toHaveAttribute('href', '#dataset-label-examples') + await expect(linkedLabel).toHaveCSS('min-height', '24px') + await expect(linkedLabel.locator('img')).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)') + + const restBackground = await linkedLabel.evaluate(element => getComputedStyle(element).backgroundColor) + await linkedLabel.hover() + await expect(linkedLabel).not.toHaveCSS('background-color', restBackground) + await linkedLabel.focus() + await expect(linkedLabel).toHaveCSS('outline-style', 'solid') +}) From ca8d74b3e6d59b6f56c2ebd9d50460ce8a40df64 Mon Sep 17 00:00:00 2001 From: agarrone Date: Fri, 13 Nov 2026 22:42:57 +0100 Subject: [PATCH 03/26] fix(design): align tags and badges with design lab --- assets/css/overrides.css | 49 +++++-- components/AdminBadge/AdminBadge.vue | 46 +++++-- .../SuiviDePublication/HvdStatutBadge.vue | 1 - components/TagsSelect.vue | 10 +- pages/design/tags.vue | 126 ++++++++++++++---- tests/design-tags.logged-out.spec.ts | 34 ++++- 6 files changed, 215 insertions(+), 51 deletions(-) diff --git a/assets/css/overrides.css b/assets/css/overrides.css index d4702fcf2..3ea99387f 100644 --- a/assets/css/overrides.css +++ b/assets/css/overrides.css @@ -37,18 +37,25 @@ /* * Compact tags and interaction states owned by cdata. * - * DSFR interactive tags are blue at rest by default. In cdata they stay neutral - * until hover/focus, while selected and dismissible values keep a stable blue. + * Consumer implementation of the Component Design Lab proposal. Static tags + * stay neutral; interactive tags use DSFR action colours and selected filters + * keep the high blue state. */ .fr-tag { + box-sizing: border-box; + gap: 0.25rem; font-size: 0.75rem; - line-height: 1.25rem; + font-weight: 400; + line-height: 1.125rem; min-height: 1.5rem; padding: 0.125rem 0.5rem; + border: 1px solid color-mix(in srgb, currentColor 20%, transparent); border-radius: 0.75rem; + color: var(--text-label-grey); + background-color: var(--background-contrast-grey); } -:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]) { +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]) { color: var(--text-label-grey); background-color: var(--background-contrast-grey); --hover: var(--background-action-low-blue-france); @@ -57,26 +64,26 @@ --active-tint: var(--background-action-low-blue-france-active); } -:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):focus-visible { +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]):focus-visible { color: var(--text-action-high-blue-france); background-color: var(--background-action-low-blue-france); outline: 2px solid var(--border-active-blue-france); outline-offset: 2px; } -:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):is(:hover, :active) { +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]):is(:hover, :active) { color: var(--text-action-high-blue-france); } -:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):hover { +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]):hover { background-color: var(--background-action-low-blue-france) !important; } -:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not(.fr-tag--dismiss, [aria-pressed="true"]):active { +:is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]):active { background-color: var(--background-action-low-blue-france-active) !important; } -:is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled) { +:is(button, input[type="button"]).fr-tag[aria-pressed="true"]:not(:disabled) { color: var(--text-inverted-blue-france); background-color: var(--background-action-high-blue-france); --hover: var(--background-action-high-blue-france); @@ -85,7 +92,7 @@ --active-tint: var(--background-action-high-blue-france-active); } -:is(button, input[type="button"]).fr-tag:is(.fr-tag--dismiss, [aria-pressed="true"]):not(:disabled):focus-visible { +:is(button, input[type="button"]).fr-tag[aria-pressed="true"]:not(:disabled):focus-visible { outline: 2px solid var(--border-active-blue-france); outline-offset: 2px; } @@ -111,10 +118,18 @@ */ @layer utilities { .cdata-dataset-label-tag { + box-sizing: border-box; min-height: 1.5rem; + padding: 0.125rem 0.5rem !important; + border: 1px solid color-mix(in srgb, currentColor 20%, transparent) !important; + border-radius: 999px !important; + font-size: 0.75rem !important; + font-weight: 400 !important; + line-height: 1.125rem !important; + text-transform: none !important; color: var(--text-label-grey) !important; background-color: var(--background-contrast-grey) !important; - gap: 0.125rem !important; + gap: 0.25rem !important; } a.cdata-dataset-label-tag:hover, @@ -127,6 +142,13 @@ background-color: var(--background-action-low-blue-france-active) !important; } + .datagouv-components .cdata-dataset-label-tag > img { + width: 0.875rem; + height: 0.875rem; + object-fit: contain; + flex-shrink: 0; + } + .datagouv-components .cdata-dataset-label-tag > img.bg-white { background-color: transparent !important; border-radius: 0 !important; @@ -143,10 +165,15 @@ a.cdata-dataset-label-tag:focus-visible { display: inline-flex; border-radius: 0.25rem; background-color: transparent !important; + background-image: none !important; --hover-tint: transparent; --active-tint: transparent; } +.hvd-status-badge-link::after { + content: none !important; +} + .hvd-status-badge-link:hover, .hvd-status-badge-link:active, .hvd-status-badge-link:focus-visible { diff --git a/components/AdminBadge/AdminBadge.vue b/components/AdminBadge/AdminBadge.vue index 070672443..22c775a3b 100644 --- a/components/AdminBadge/AdminBadge.vue +++ b/components/AdminBadge/AdminBadge.vue @@ -1,12 +1,16 @@ @@ -48,12 +55,31 @@ const colors = computed(() => { }[props.type] }) -const sizes = computed(() => { - return { - xs: 'text-xs/5 px-1 rounded-sm', - sm: 'text-xs/6 px-2 rounded', - }[props.size] -}) - -const iconSize = computed(() => props.iconSize || 'size-3') +const iconSize = computed(() => props.iconSize || 'size-3.5') + + diff --git a/components/SuiviDePublication/HvdStatutBadge.vue b/components/SuiviDePublication/HvdStatutBadge.vue index 495146e87..36bc5d671 100644 --- a/components/SuiviDePublication/HvdStatutBadge.vue +++ b/components/SuiviDePublication/HvdStatutBadge.vue @@ -14,7 +14,6 @@ :icon-right="RiExternalLinkLine" size="sm" :no-wrap="false" - icon-size="size-3" > {{ statut }} diff --git a/components/TagsSelect.vue b/components/TagsSelect.vue index 6d1c54700..de3babfba 100644 --- a/components/TagsSelect.vue +++ b/components/TagsSelect.vue @@ -19,19 +19,24 @@
@@ -39,6 +44,7 @@ diff --git a/tests/design-tags.logged-out.spec.ts b/tests/design-tags.logged-out.spec.ts index 3fc4b1a86..09e30756c 100644 --- a/tests/design-tags.logged-out.spec.ts +++ b/tests/design-tags.logged-out.spec.ts @@ -13,7 +13,9 @@ test('shows every compact tag state', async ({ page }) => { for (const tag of [staticTag, clickableTag, selectableTag, disabledTag]) { await expect(tag).toHaveCSS('font-size', '12px') + await expect(tag).toHaveCSS('line-height', '18px') await expect(tag).toHaveCSS('min-height', '24px') + await expect(tag).toHaveCSS('border-top-width', '1px') } const restBackground = await clickableTag.evaluate(element => getComputedStyle(element).backgroundColor) @@ -31,13 +33,20 @@ test('shows every compact tag state', async ({ page }) => { const disabledBackground = await disabledTag.evaluate(element => getComputedStyle(element).backgroundColor) await disabledTag.hover() await expect(disabledTag).toHaveCSS('background-color', disabledBackground) + + const dismissibleTag = page.getByTestId('dismissible-tag') + const dismissibleBackground = await dismissibleTag.evaluate(element => getComputedStyle(element).backgroundColor) + await dismissibleTag.hover() + await expect(dismissibleTag).not.toHaveCSS('background-color', dismissibleBackground) }) test('shows and removes multiple TagsSelect values', async ({ page }) => { const selectedTags = page.getByTestId('selected-tags') await expect(selectedTags.getByRole('button')).toHaveCount(3) await expect(selectedTags.getByRole('button').first()).toHaveCSS('font-size', '12px') + await expect(selectedTags.getByRole('button').first()).toHaveCSS('line-height', '18px') await expect(selectedTags.getByRole('button').first()).toHaveCSS('min-height', '24px') + await expect(selectedTags.getByRole('button').first().locator('svg')).toHaveCSS('width', '14px') await page.getByRole('button', { name: 'Supprimer le mot-clé transport' }).click() await expect(selectedTags.getByRole('button')).toHaveCount(2) @@ -49,8 +58,10 @@ test('shows DatasetLabelTag with and without a link', async ({ page }) => { const linkedLabel = page.getByTestId('dataset-label-link') await expect(staticLabel).not.toHaveAttribute('href') - await expect(linkedLabel).toHaveAttribute('href', '#dataset-label-examples') + await expect(linkedLabel).toHaveAttribute('href', '/datasets/search?badge=hvd') + await expect(staticLabel).toHaveCSS('line-height', '18px') await expect(linkedLabel).toHaveCSS('min-height', '24px') + await expect(linkedLabel.locator('img')).toHaveCSS('width', '14px') await expect(linkedLabel.locator('img')).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)') const restBackground = await linkedLabel.evaluate(element => getComputedStyle(element).backgroundColor) @@ -59,3 +70,24 @@ test('shows DatasetLabelTag with and without a link', async ({ page }) => { await linkedLabel.focus() await expect(linkedLabel).toHaveCSS('outline-style', 'solid') }) + +test('shows HvdStatutBadge with and without a data URL', async ({ page }) => { + await expect(page.getByTestId('hvd-status-empty').getByText('-', { exact: true })).toBeVisible() + + const staticBadge = page.getByTestId('hvd-status-static').locator('.admin-badge') + await expect(staticBadge).toHaveCSS('text-transform', 'none') + + const linkedBadge = page.getByTestId('hvd-status-link').locator('a') + await expect(linkedBadge).toHaveAttribute('target', '_blank') + await expect(linkedBadge).toHaveAttribute('rel', 'noopener noreferrer') + await expect(linkedBadge).toHaveAttribute('aria-label', /Publié.*Voir les données.*nouvel onglet/) + await expect(linkedBadge.locator('svg')).toHaveCount(1) + await expect(linkedBadge.locator('svg')).toHaveCSS('width', '14px') + + const badgeBackground = await linkedBadge.locator('.admin-badge').evaluate(element => getComputedStyle(element).backgroundColor) + await linkedBadge.hover() + await expect(linkedBadge.locator('.admin-badge')).toHaveCSS('background-color', badgeBackground) + await expect(linkedBadge.locator('.admin-badge > span')).toHaveCSS('text-decoration-line', 'underline') + await linkedBadge.focus() + await expect(linkedBadge).toHaveCSS('outline-style', 'solid') +}) From d99420b58206c73dfe8f097b39cd0df30f3b87f8 Mon Sep 17 00:00:00 2001 From: agarrone Date: Sat, 14 Nov 2026 08:54:36 +0100 Subject: [PATCH 04/26] fix(tags): keep a visible stroke on metadata tags --- assets/css/overrides.css | 34 +++++++++++++++++++++++++-- pages/datasets/[did]/informations.vue | 5 +++- pages/design/tags.vue | 16 ++++++++++--- tests/design-tags.logged-out.spec.ts | 18 ++++++++++++++ 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/assets/css/overrides.css b/assets/css/overrides.css index 3ea99387f..bb68cb93e 100644 --- a/assets/css/overrides.css +++ b/assets/css/overrides.css @@ -49,12 +49,42 @@ line-height: 1.125rem; min-height: 1.5rem; padding: 0.125rem 0.5rem; - border: 1px solid color-mix(in srgb, currentColor 20%, transparent); + border: 1px solid var(--border-default-grey); border-radius: 0.75rem; color: var(--text-label-grey); background-color: var(--background-contrast-grey); } +/* + * @datagouv/components-next Tag does not expose a bordered variant yet. + * cdata adds the Design Lab stroke to its direct examples and to the tags + * rendered by DatasetInformationSection without changing the shared package. + */ +@layer utilities { + .cdata-tag, + .cdata-dataset-information .fr-raw-link > span { + box-sizing: border-box; + min-height: 1.5rem; + border: 1px solid var(--border-default-grey) !important; + } + + .cdata-tag-link:hover > .cdata-tag, + .cdata-tag-link:focus-visible > .cdata-tag, + .cdata-dataset-information .fr-raw-link:hover > span, + .cdata-dataset-information .fr-raw-link:focus-visible > span { + color: var(--text-action-high-blue-france) !important; + border-color: var(--border-action-high-blue-france) !important; + background-color: var(--background-action-low-blue-france) !important; + } +} + +.cdata-tag-link:focus-visible, +.cdata-dataset-information .fr-raw-link:focus-visible { + border-radius: 0.75rem; + outline: 2px solid var(--border-active-blue-france); + outline-offset: 2px; +} + :is(a[href], button:not(:disabled), input[type="button"]:not(:disabled)).fr-tag:not([aria-pressed="true"]) { color: var(--text-label-grey); background-color: var(--background-contrast-grey); @@ -121,7 +151,7 @@ box-sizing: border-box; min-height: 1.5rem; padding: 0.125rem 0.5rem !important; - border: 1px solid color-mix(in srgb, currentColor 20%, transparent) !important; + border: 1px solid var(--border-default-grey) !important; border-radius: 999px !important; font-size: 0.75rem !important; font-weight: 400 !important; diff --git a/pages/datasets/[did]/informations.vue b/pages/datasets/[did]/informations.vue index e17b2d61e..414bbc5e2 100644 --- a/pages/datasets/[did]/informations.vue +++ b/pages/datasets/[did]/informations.vue @@ -1,6 +1,9 @@ diff --git a/tests/design-tags.logged-out.spec.ts b/tests/design-tags.logged-out.spec.ts index 0f020486d..ad57ae6f3 100644 --- a/tests/design-tags.logged-out.spec.ts +++ b/tests/design-tags.logged-out.spec.ts @@ -43,6 +43,25 @@ test('shows every compact tag state', async ({ page }) => { await expect(dismissibleTag).not.toHaveCSS('background-color', dismissibleBackground) }) +test('opens and closes a tag toggletip', async ({ page }) => { + const tag = page.getByTestId('toggletip-tag') + const content = page.getByTestId('toggletip-tag-content') + + await expect(tag).toHaveCSS('font-size', '12px') + await expect(tag).toHaveCSS('min-height', '24px') + await expect(tag.locator('svg')).toHaveCount(1) + await tag.focus() + await expect(tag).toHaveCSS('outline-style', 'solid') + + await tag.click() + await expect(tag).toHaveAttribute('aria-expanded', 'true') + await expect(content).toBeVisible() + + await page.getByTestId('toggletip-tag-close').click() + await expect(tag).toHaveAttribute('aria-expanded', 'false') + await expect(content).toBeHidden() +}) + test('shows the business labels used by cards', async ({ page }) => { const labels = page.getByTestId('card-business-labels') const statuses = page.getByTestId('table-statuses') @@ -68,6 +87,10 @@ test('shows the business labels used by cards', async ({ page }) => { const accountAccessBadge = accessTypes.locator('.admin-badge').filter({ hasText: 'Ouvert avec un compte' }) await expect(accountCardBadge).toHaveCSS('color', await accountAccessBadge.evaluate(element => getComputedStyle(element).color)) await expect(accountCardBadge).toHaveCSS('background-color', await accountAccessBadge.evaluate(element => getComputedStyle(element).backgroundColor)) + + const draftIcon = cardBadges.filter({ hasText: 'Brouillon' }).locator('svg') + const restrictedIcon = cardBadges.filter({ hasText: 'Accès restreint' }).locator('svg') + expect(await draftIcon.innerHTML()).not.toBe(await restrictedIcon.innerHTML()) }) test('shows API access types with the account-only yellow tone', async ({ page }) => { @@ -109,12 +132,10 @@ test('shows the statuses used in tables', async ({ page }) => { await expect(badges.first().locator(':scope > span')).toHaveCSS('transform', 'matrix(1, 0, 0, 1, 0, -1)') }) -test('shows resource license, schema and format metadata', async ({ page }) => { - const metadata = page.getByTestId('resource-metadata-badges') +test('shows the data schema badge', async ({ page }) => { + const schema = page.getByTestId('schema-badge') - await expect(metadata.getByText('Licence Ouverte 2.0', { exact: true })).toBeVisible() - await expect(metadata.getByText('etalab/schema-irve', { exact: true })).toBeVisible() - await expect(metadata.getByText('CSV', { exact: true })).toBeVisible() + await expect(schema.getByText('etalab/schema-irve', { exact: true })).toBeVisible() }) test('shows component tags with a stroke, including the linked variant', async ({ page }) => { From 94b89cbea5bec81cb527245812b69c887eb7aad4 Mon Sep 17 00:00:00 2001 From: agarrone Date: Sat, 14 Nov 2026 21:02:49 +0100 Subject: [PATCH 14/26] fix(design): align tag toggletip and icon order --- pages/design/tags.vue | 33 ++++++++++------------------ tests/design-tags.logged-out.spec.ts | 6 ++++- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pages/design/tags.vue b/pages/design/tags.vue index f2022996f..4a96a873b 100644 --- a/pages/design/tags.vue +++ b/pages/design/tags.vue @@ -84,32 +84,23 @@ 'data-testid': 'toggletip-tag', }" > - Avec infobulle