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

fix(ui5-side-navigation): replace items and fixedItems union type with SideNavigationItemBase #8862

Merged
merged 1 commit into from
May 8, 2024
Merged

fix(ui5-side-navigation): replace items and fixedItems union type with SideNavigationItemBase #8862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions packages/fiori/src/SideNavigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class SideNavigation extends UI5Element {
* @public
*/
@slot({ type: HTMLElement, invalidateOnChildChange: true, "default": true })
items!: Array<SideNavigationItem | SideNavigationGroup>;
items!: Array<SideNavigationItemBase>;

/**
* Defines the fixed items at the bottom of the `ui5-side-navigation`. Use the `ui5-side-navigation-item` component
Expand All @@ -164,7 +164,7 @@ class SideNavigation extends UI5Element {
* @public
*/
@slot({ type: HTMLElement, invalidateOnChildChange: true })
fixedItems!: Array<SideNavigationItem | SideNavigationGroup>;
fixedItems!: Array<SideNavigationItemBase>;

/**
* Defines the header of the `ui5-side-navigation`.
Expand Down Expand Up @@ -224,7 +224,7 @@ class SideNavigation extends UI5Element {
onBeforeRendering() {
super.onBeforeRendering();

this._getAllItems(this.items).concat(this._getAllItems(this.fixedItems)).forEach(item => {
this._getAllItems(this.items as Array<SideNavigationItem | SideNavigationGroup>).concat(this._getAllItems(this.fixedItems as Array<SideNavigationItem | SideNavigationGroup>)).forEach(item => {
item.sideNavCollapsed = this.collapsed;
item.inPopover = this.inPopover;
item.sideNavigation = this;
Expand All @@ -236,7 +236,7 @@ class SideNavigation extends UI5Element {
// item navigation index should be managed, because items are
// dynamically recreated and tabIndexes are not updated
const tree = await this.getPickerTree();
const selectedItem = tree._findSelectedItem(tree.items);
const selectedItem = tree._findSelectedItem(tree.items as Array<SideNavigationItem | SideNavigationGroup>);
if (selectedItem) {
selectedItem.focus();
} else {
Expand Down Expand Up @@ -386,11 +386,11 @@ class SideNavigation extends UI5Element {
}

getEnabledFixedItems() : Array<ITabbable> {
return this.getEnabledItems(this.fixedItems);
return this.getEnabledItems(this.fixedItems as Array<SideNavigationItem | SideNavigationGroup>);
}

getEnabledFlexibleItems() : Array<ITabbable> {
const items = this.getEnabledItems(this.items);
const items = this.getEnabledItems(this.items as Array<SideNavigationItem | SideNavigationGroup>);

if (this._overflowItem) {
items.push(this._overflowItem);
Expand Down Expand Up @@ -425,12 +425,12 @@ class SideNavigation extends UI5Element {

onAfterRendering() {
if (!this.getDomRef()?.matches(":focus-within")) {
let selectedItem = this._findSelectedItem(this.items);
let selectedItem = this._findSelectedItem(this.items as Array<SideNavigationItem | SideNavigationGroup>);
if (selectedItem) {
this._flexibleItemNavigation.setCurrentItem(selectedItem);
}

selectedItem = this._findSelectedItem(this.fixedItems);
selectedItem = this._findSelectedItem(this.fixedItems as Array<SideNavigationItem | SideNavigationGroup>);
if (selectedItem) {
this._fixedItemNavigation.setCurrentItem(selectedItem);
}
Expand Down Expand Up @@ -549,7 +549,7 @@ class SideNavigation extends UI5Element {
}

get overflowItems() : Array<HTMLElement> {
return this.items.reduce((result, item) => {
return (this.items as Array<SideNavigationItem | SideNavigationGroup>).reduce((result, item) => {
return result.concat(item.overflowItems);
}, new Array<HTMLElement>());
}
Expand Down Expand Up @@ -609,8 +609,8 @@ class SideNavigation extends UI5Element {
return;
}

let items = this._getSelectableItems(this.items);
items = items.concat(this._getSelectableItems(this.fixedItems));
let items = this._getSelectableItems(this.items as Array<SideNavigationItem | SideNavigationGroup>);
items = items.concat(this._getSelectableItems(this.fixedItems as Array<SideNavigationItem | SideNavigationGroup>));

items.forEach(current => {
current.selected = false;
Expand Down