Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
139 changes: 100 additions & 39 deletions packages/fiori/src/SideNavigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -537,74 +537,135 @@
}
}

_updateOverflowItems() {
const domRef = this.getDomRef();
if (!this.collapsed || !domRef) {
return null;
}

const overflowItem = this._overflowItem!;
const flexibleContentDomRef: HTMLElement = domRef.querySelector(".ui5-sn-flexible")!;
if (!overflowItem) {
return null;
}

overflowItem.classList.add("ui5-sn-item-hidden");

const overflowItems = this.overflowItems;

let itemsHeight = overflowItems.reduce<number>((sum, itemRef) => {
_resetAndCalculateItemsHeight() {
return this.overflowItems.reduce<number>((sum, itemRef) => {
if (!itemRef) {
return sum;
}
itemRef.classList.remove("ui5-sn-item-hidden");
return sum + itemRef.offsetHeight;
}, 0);

const { paddingTop, paddingBottom } = window.getComputedStyle(flexibleContentDomRef);
const listHeight = flexibleContentDomRef?.offsetHeight - parseInt(paddingTop) - parseInt(paddingBottom);
let itemDomRef = itemRef;

if (itemsHeight <= listHeight) {
return;
}
if (isInstanceOfSideNavigationItemBase(itemRef) && itemRef.getDomRef()) {
itemDomRef = itemRef.getDomRef()!;
}

overflowItem.classList.remove("ui5-sn-item-hidden");
const { marginTop, marginBottom } = window.getComputedStyle(itemDomRef);

itemsHeight = overflowItem.offsetHeight;
return sum + itemDomRef.offsetHeight + parseFloat(marginTop) + parseFloat(marginBottom);
}, 0);
}

_getSelectedItemHeight() {
const overflowItems = this.overflowItems;
const selectedItem = overflowItems.filter(isInstanceOfSideNavigationSelectableItemBase).find(item => item._selected);

if (!selectedItem) {
return 0;
}

let height = 0;

if (selectedItem) {
const selectedItemDomRef = selectedItem.getDomRef();

if (selectedItemDomRef) {
const { marginTop, marginBottom } = window.getComputedStyle(selectedItemDomRef);
itemsHeight += selectedItemDomRef.offsetHeight + parseFloat(marginTop) + parseFloat(marginBottom);
height += selectedItemDomRef.offsetHeight + parseFloat(marginTop) + parseFloat(marginBottom);
}

const indexOf = overflowItems.indexOf(selectedItem);
const itemAfterSelected = overflowItems[indexOf + 1];
if (itemAfterSelected && !isInstanceOfSideNavigationItemBase(itemAfterSelected)) {
height += itemAfterSelected.offsetHeight;
}
}

overflowItems.forEach(item => {
return height;
}

_updateVisibility(selectedItem: SideNavigationSelectableItemBase | undefined, itemsHeight: number, listHeight: number) {
const overflowItems = this.overflowItems;

for (let i = 0; i < overflowItems.length; i++) {
const item = overflowItems[i];
const nextItem = overflowItems[i + 1];
let nextItemDomRef;

if (!item || item === selectedItem) {
return;
continue;

Check failure on line 596 in packages/fiori/src/SideNavigation.ts

View workflow job for this annotation

GitHub Actions / check

Unexpected use of continue statement
}

let itemDomRef;

if (isInstanceOfSideNavigationItemBase(item) && item.getDomRef()) {
if (isInstanceOfSideNavigationItemBase(item)) {
itemDomRef = item.getDomRef();
} else {
itemDomRef = item;
}

if (itemDomRef) {
const { marginTop, marginBottom } = window.getComputedStyle(itemDomRef);
itemsHeight += itemDomRef.offsetHeight + parseFloat(marginTop) + parseFloat(marginBottom);
if (!itemDomRef) {
continue;

Check failure on line 606 in packages/fiori/src/SideNavigation.ts

View workflow job for this annotation

GitHub Actions / check

Unexpected use of continue statement
}

const { marginTop, marginBottom } = window.getComputedStyle(itemDomRef);
itemsHeight += itemDomRef.offsetHeight + parseFloat(marginTop) + parseFloat(marginBottom);

if (nextItem && !isInstanceOfSideNavigationItemBase(nextItem)) {
nextItemDomRef = nextItem;
i++;

if (itemsHeight > listHeight) {
item.classList.add("ui5-sn-item-hidden");
}
itemsHeight += nextItemDomRef.offsetHeight;
}
});

if (itemsHeight > listHeight) {
item.classList.add("ui5-sn-item-hidden");
nextItemDomRef?.classList.add("ui5-sn-item-hidden");
}

nextItemDomRef = null;
}
}

_updateOverflowItems() {
const domRef = this.getDomRef();
if (!this.collapsed || !domRef) {
return null;
}

const overflowItem = this._overflowItem;
if (!overflowItem) {
return null;
}

overflowItem.classList.add("ui5-sn-item-hidden");

const overflowItems = this.overflowItems;

let itemsHeight = this._resetAndCalculateItemsHeight();

const flexibleContentDomRef: HTMLElement = domRef.querySelector(".ui5-sn-flexible")!;
const { paddingTop, paddingBottom } = window.getComputedStyle(flexibleContentDomRef);
let listHeight = flexibleContentDomRef?.offsetHeight - parseInt(paddingTop) - parseInt(paddingBottom);

if (itemsHeight < listHeight) {
return;
}

overflowItem.classList.remove("ui5-sn-item-hidden");

itemsHeight = overflowItem.offsetHeight;

const selectedItem = overflowItems.filter(isInstanceOfSideNavigationSelectableItemBase).find(item => item._selected);

itemsHeight += this._getSelectedItemHeight();

listHeight--; // account for sub-pixel rounding

const lastItem = overflowItems[overflowItems.length - 1];
if (!isInstanceOfSideNavigationItemBase(lastItem)) {
listHeight -= lastItem.offsetHeight;
}

this._updateVisibility(selectedItem, itemsHeight, listHeight);

this._flexibleItemNavigation._init();
}
Expand Down
8 changes: 8 additions & 0 deletions packages/fiori/src/themes/SideNavigation.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,12 @@

.ui5-sn-item-overflow {
margin-top: auto;
}

.ui5-sn-spacer {
margin: var(--_ui5_side_navigation_navigation_separator_margin);
height: var(--_ui5_side_navigation_navigation_separator_height);
min-height: var(--_ui5_side_navigation_navigation_separator_height);
background-color: var(--_ui5_side_navigation_navigation_separator_background_color);
border-radius: var(--_ui5_side_navigation_navigation_separator_radius);
}
10 changes: 1 addition & 9 deletions packages/fiori/src/themes/SideNavigationGroup.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,4 @@
.ui5-sn-item-group-below-group.ui5-sn-item-separator,
.ui5-sn-item-group-below-group .ui5-sn-item-separator:first-child {
display: none;
}

.ui5-sn-spacer {
margin: var(--_ui5_side_navigation_navigation_separator_margin);
height: var(--_ui5_side_navigation_navigation_separator_height);
min-height: var(--_ui5_side_navigation_navigation_separator_height);
background-color: var(--_ui5_side_navigation_navigation_separator_background_color);
border-radius: var(--_ui5_side_navigation_navigation_separator_radius);
}
}
1 change: 1 addition & 0 deletions packages/fiori/src/themes/SideNavigationItemBase.css
Original file line number Diff line number Diff line change
Expand Up @@ -407,4 +407,5 @@ and there is an additional border that appears on hover. */

.ui5-sn-item-separator {
min-height: 0.625rem;
background: red;
}
73 changes: 73 additions & 0 deletions packages/fiori/test/pages/SideNavigationTest.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Side Navigation Only</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<script src="%VITE_BUNDLE_PATH%" type="module"></script>
</head>

<body style="background-color: var(--sapBackgroundColor); height: 100vh;">
<ui5-side-navigation id="sn1" collapsed>
<!-- Top items: enough items to overflow into fixed bottom area on short screens -->
<ui5-side-navigation-item
text="Item 1"
icon="home"
></ui5-side-navigation-item>
<ui5-side-navigation-item
text="Item 2"
icon="home"
></ui5-side-navigation-item>

<ui5-side-navigation-group>
<ui5-side-navigation-item
text="Item 3"
icon="home"
></ui5-side-navigation-item>
<ui5-side-navigation-item
text="Item 4"
icon="home"
></ui5-side-navigation-item>
</ui5-side-navigation-group>

<ui5-side-navigation-group>
<ui5-side-navigation-item
text="Item 5"
icon="home"
></ui5-side-navigation-item>
<ui5-side-navigation-item
text="Item 6"
icon="home"
></ui5-side-navigation-item>
</ui5-side-navigation-group>

<ui5-side-navigation-group>
<ui5-side-navigation-item
text="Item 7"
icon="home"
></ui5-side-navigation-item>
<ui5-side-navigation-item
text="Item 8"
icon="home"
></ui5-side-navigation-item>
</ui5-side-navigation-group>

<ui5-side-navigation-item
text="Outer"
icon="home"
></ui5-side-navigation-item>

<!-- Fixed bottom items: these should never be overlapped by top items -->
<ui5-side-navigation-item
slot="fixedItems"
text="Legal"
icon="home"
></ui5-side-navigation-item>
<ui5-side-navigation-item
slot="fixedItems"
text="Help"
icon="home"
></ui5-side-navigation-item>
</ui5-side-navigation>
</body>
</html>
Loading