Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix(breadcrumb): ajoute une page exemple alternative [DS-3254] #600

Merged
merged 6 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
<% const sample = getSample(include); %>

<% const getData = (data = {}) => {
return {
id: uniqueId('breadcrumb'),
segments: [
{ label: 'Accueil', id: uniqueId('breadcrumb') },
{ label: 'Segment 1 : lorem ipsum', id: uniqueId('breadcrumb') },
{ label: 'Segment 2 : lorem ipsum', id: uniqueId('breadcrumb') },
{ label: 'Segment 3 : lorem ipsum', id: uniqueId('breadcrumb') },
{ label: 'Page Actuelle' }
],
...data
}
};
%>

<div class="<%= prefix %>-container" >

<%- section('Étiquette d’élément BUTTON' , null, 0) %>
<%- include('../../../../../component/breadcrumb/template/ejs/breadcrumb.ejs', { breadcrumb: getData({ markup: 'button' }) }); %>

<%- include('../../../../../component/breadcrumb/example/alternative/index.ejs', { }); %>
</div>
17 changes: 1 addition & 16 deletions src/analytics/example/component/breadcrumb/index.ejs
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
<% const sample = getSample(include); %>

<% const getData = (data = {}) => {
return {
id: uniqueId('breadcrumb'),
segments: [
{ path: '', label: 'Accueil', id: uniqueId('breadcrumb') },
{ path: 'segment-1', label: 'Segment 1 : lorem ipsum', id: uniqueId('breadcrumb') },
{ path: 'segment-2', label: 'Segment 2 : lorem ipsum', id: uniqueId('breadcrumb') },
{ path: 'segment-3', label: 'Segment 3 : lorem ipsum', id: uniqueId('breadcrumb') },
{ label: 'Page Actuelle' }
],
...data
}
};
%>

<div class="<%= prefix %>-container" >

<%- section('Étiquette d’élément A' , null, 0) %>
<%- include('../../../../component/breadcrumb/template/ejs/breadcrumb.ejs', { breadcrumb: getData() }); %>
<%- include('../../../../component/breadcrumb/example/sample/sample-a.ejs', {}); %>

</div>
15 changes: 15 additions & 0 deletions src/component/breadcrumb/example/alternative/index.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<% const data = {
id: uniqueId('breadcrumb'),
segments: [
{ markup: 'button', path: undefined, label: 'Accueil' },
{ markup: 'button', path: undefined, label: 'Segment 1 : lorem ipsum' },
{ markup: 'button', path: undefined, label: 'Segment 2 : lorem ipsum' },
{ markup: 'button', path: undefined, label: 'Segment 3 : lorem ipsum dolor sit amet' },
{ markup: 'span', path: undefined, label: 'Page Actuelle' }
],
...locals.breadcrumb
}
%>

<%- section('Étiquette d’élément BUTTON' , null, 0) %>
<%- include('../../template/ejs/breadcrumb.ejs', {breadcrumb: data}); %>
4 changes: 3 additions & 1 deletion src/component/breadcrumb/example/index.ejs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<% const sample = getSample(include); %>

<%- sample('Fil d’Ariane', './sample/breadcrumb', { }, true); %>
<%- sample('Fil d’Ariane avec liens', './sample/sample-a', { }, true); %>


6 changes: 6 additions & 0 deletions src/component/breadcrumb/i18n/fr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
title: Fil d'Ariane
description: Le fil d’Ariane est un système de navigation secondaire qui permet à l’utilisateur de se situer sur le site qu’il consulte.
doc: https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/fil-d-ariane
subdir:
title: Mises en situation
alternative: Alternatives
15 changes: 6 additions & 9 deletions src/component/breadcrumb/style/_module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,19 @@ un padding de 4px et une marge négative en compensation sont mis en place afin
}
}
}

&__link {
vertical-align: top;
position: relative;
lab9fr marked this conversation as resolved.
Show resolved Hide resolved
@include link-underline;
@include disable-tint;
@include text-style(xs);
@include padding(0);
@include hover-underline;

@include padding(0);

&[aria-current] {
&:not(button):not([href]) {
pointer-events: none;
cursor: default;
@include disable-underline;
}
pointer-events: none;
cursor: default;
@include disable-underline;
}
}
}
21 changes: 13 additions & 8 deletions src/component/breadcrumb/template/ejs/breadcrumb.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<%
let breadcrumb = locals.breadcrumb || {segments : []};
if (breadcrumb.button === undefined) breadcrumb.button = 'Voir le fil d’Ariane';
const markup = breadcrumb.markup || 'a';
%>

<nav role="navigation" class="<%= prefix %>-breadcrumb" aria-label="vous êtes ici :">
Expand All @@ -26,20 +25,26 @@ const markup = breadcrumb.markup || 'a';
<ol class="<%= prefix %>-breadcrumb__list">
<%
let path = '';
const attrs = {};
for (let i = 0; i < breadcrumb.segments.length; i++) {
const segmentAttrs = {};
const segment = breadcrumb.segments[i];
const markup = segment.markup || 'a';
if (segment.path != undefined) path += segment.path + '/';
if (segment.id) attrs.id = segment.id;
if (segment.href) {
attrs['href'] = segment.href;
if (segment.id) segmentAttrs.id = segment.id;
if (i === breadcrumb.segments.length - 1) {
segmentAttrs['aria-current'] = 'page';
} else {
if (i === breadcrumb.segments.length - 1) attrs['aria-current'] = 'page';
else if (path !== '') attrs['href'] = path;
if (markup == 'a') {
if (segment.href) {
segmentAttrs['href'] = segment.href;
} else {
segmentAttrs['href'] = path;
}
}
}
%>
<li>
<<%= markup %> class="<%= prefix %>-breadcrumb__link" <%- includeAttrs(attrs);%>><%= segment.label %></<%= markup %>>
<<%= markup %> class="<%= prefix %>-breadcrumb__link" <%- includeAttrs(segmentAttrs);%>><%= segment.label %></<%= markup %>>
</li>
<% } %>
</ol>
Expand Down