Skip to content

fix(ui5-side-navigation): group as first item works without error #11406

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(ui5-side-navigation): group as first item works without error #11406

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de3c3ae
fix(ui5-side-navigation): group as first item works without error
s-todorova Apr 24, 2025
11e7529
chore: refactor ui5-sn-item-group-below-group class handling
s-todorova Apr 25, 2025
d62a161
chore: fix logic for belowGroup property
s-todorova Apr 25, 2025
46532ed
chore: add tests
s-todorova Apr 25, 2025
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
18 changes: 18 additions & 0 deletions packages/fiori/src/SideNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { isInstanceOfSideNavigationSelectableItemBase } from "./SideNavigationSe
import { isInstanceOfSideNavigationItemBase } from "./SideNavigationItemBase.js";
import type SideNavigationSelectableItemBase from "./SideNavigationSelectableItemBase.js";
import { isInstanceOfSideNavigationItem } from "./SideNavigationItem.js";
import { isInstanceOfSideNavigationGroup } from "./SideNavigationGroup.js";
import type SideNavigationItem from "./SideNavigationItem.js";
import type SideNavigationSubItem from "./SideNavigationSubItem.js";
import type SideNavigationGroup from "./SideNavigationGroup.js";
Expand Down Expand Up @@ -242,6 +243,23 @@ class SideNavigation extends UI5Element {
item.inPopover = this.inPopover;
item.sideNavigation = this;
});

this.initGroupsSettings(this.items);
this.initGroupsSettings(this.fixedItems);
}

initGroupsSettings(items: Array<SideNavigationItemBase>) {
let isPreviousItemGroup = false;

items.forEach(item => {
const isGroup = isInstanceOfSideNavigationGroup(item);

if (isGroup && isPreviousItemGroup) {
item.belowGroup = true;
}

isPreviousItemGroup = isGroup;
});
}

_onAfterPopoverOpen() {
Expand Down
9 changes: 4 additions & 5 deletions packages/fiori/src/SideNavigationGroup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ class SideNavigationGroup extends SideNavigationItemBase {
@property({ type: Boolean })
expanded = false;

@property({ type: Boolean })
belowGroup = false;

/**
* Defines nested items by passing `ui5-side-navigation-item` to the default slot.
*
Expand Down Expand Up @@ -123,11 +126,7 @@ class SideNavigationGroup extends SideNavigationItemBase {
}

get belowGroupClassName() {
if (isInstanceOfSideNavigationGroup(this.previousElementSibling)) {
return "ui5-sn-item-group-below-group";
}

return "";
return this.belowGroup ? "ui5-sn-item-group-below-group" : "";
}

get accDescription() {
Expand Down
Loading