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.

Sign up for GitHub

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

Jump to bottom

[SD-314] Breadcrumbs enhancement #1329

Open
wants to merge 3 commits into
base: release/2.17.0
Choose a base branch
from
+65 −12
Open

[SD-314] Breadcrumbs enhancement #1329

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c143343
refactor(@dpc-sdp/ripple-ui-core): :recycle: rework breadcrumbs for 4…
waitingallday Aug 14, 2024
405b936
Merge branch 'develop' into feat/breadcrumbs-update
waitingallday Sep 17, 2024
94f38f1
refactor(@dpc-sdp/ripple-ui-core): :recycle: improve accessibility
waitingallday Sep 17, 2024
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
24 changes: 21 additions & 3 deletions packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
display: inline-block;
margin-left: var(--local-horizontal-offset);
padding-top: calc(var(--rpl-sp-3) - var(--rpl-border-1));
padding-right: calc(var(--rpl-sp-5) - var(--rpl-border-1));
padding-right: calc(var(--rpl-sp-4) - var(--rpl-border-1));
padding-bottom: calc(var(--rpl-sp-3) - var(--rpl-border-1));
padding-left: calc(var(--rpl-sp-5) - var(--rpl-border-1));
padding-left: calc(var(--rpl-sp-4) - var(--rpl-border-1));
max-width: calc(100% - var(--local-horizontal-offset) * 2);
overflow: hidden;
text-overflow: ellipsis;
Expand All @@ -21,6 +21,8 @@
@media (--rpl-bp-m) {
--local-horizontal-offset: var(--rpl-sp-4);

padding-right: calc(var(--rpl-sp-5) - var(--rpl-border-1));
padding-left: calc(var(--rpl-sp-5) - var(--rpl-border-1));
height: auto;
overflow: visible;
white-space: normal;
Expand Down Expand Up @@ -84,6 +86,22 @@
&--beside-exit {
--local-width-spacer: 124px;

max-width: calc(100% - var(--local-horizontal-offset) * 3 - var(--local-width-spacer));
max-width: calc(
100% - var(--local-horizontal-offset) * 3 - var(--local-width-spacer)
);
}
}

.rpl-breadcrumbs__collapse-link::before {
content: '>';
display: inline;
padding: 0 var(--rpl-sp-2);
}

.rpl-breadcrumbs__collapse-link-trigger:hover {
text-decoration: underline;
}

.rpl-breadcrumbs__item--collapsed {
display: none;
}
52 changes: 43 additions & 9 deletions packages/ripple-ui-core/src/components/breadcrumbs/RplBreadcrumbs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script setup lang="ts">
import { ref } from 'vue'
import RplTextLink from '../text-link/RplTextLink.vue'
import {
useRippleEvent,
Expand Down Expand Up @@ -38,6 +39,16 @@ const handleClick = (item, index) => {
{ global: true }
)
}

const collapseInnerLinks = ref()
collapseInnerLinks.value = props.items.length > 3

const firstItem = (index: number) => index === 0
const lastItem = (index: number) => index === props.items.length - 1

const toggleCollapsed = () => {
collapseInnerLinks.value = 0
}
</script>

<template>
Expand All @@ -49,26 +60,49 @@ const handleClick = (item, index) => {
'rpl-breadcrumbs--beside-exit': props.besideQuickExit
}"
>
<ol v-if="items.length > 0" class="rpl-breadcrumbs__items rpl-type-p">
<ol
v-if="items.length > 0"
:class="[
'rpl-breadcrumbs__items',
'rpl-type-p-small',
{ 'rpl-breadcrumbs__items--collapsed': collapseInnerLinks }
]"
>
<li
v-for="(item, index) of items"
:key="index"
:class="{
'rpl-breadcrumbs__item': true,
'rpl-breadcrumbs__item--parent': index === items.length - 2
}"
:class="[
'rpl-breadcrumbs__item',
{ 'rpl-breadcrumbs__item--parent': index === items.length - 1 },
{
'rpl-breadcrumbs__item--first':
firstItem(index) && collapseInnerLinks
},
{
'rpl-breadcrumbs__item--collapsed':
!firstItem(index) && !lastItem(index) && collapseInnerLinks
}
]"
>
<RplTextLink
v-if="index < items.length - 1"
:url="item.url"
:theme="false"
class="rpl-breadcrumbs__item-link"
@click="() => handleClick(item, index)"
>{{ item.text }}</RplTextLink
>
<span v-else class="rpl-breadcrumbs__item--current">{{
item.text
}}</span>
<span
v-if="firstItem(index) && collapseInnerLinks"
class="rpl-breadcrumbs__collapse-link"
>
<RplTextLink
url=""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, can this be a button (then we won't need the url) with an aria-label? Cheers

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yeah, good pick up!

:theme="false"
class="rpl-breadcrumbs__collapse-link-trigger"
@click.prevent="() => toggleCollapsed()"
>&hellip;</RplTextLink
>
</span>
</li>
</ol>
</nav>
Expand Down
Loading