Skip to content
Merged
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
2 changes: 1 addition & 1 deletion projects/ngx-material-navigation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-material-navigation",
"version": "20.2.1",
"version": "20.2.2",
"license": "MIT",
"repository": {
"url": "https://github.com/Service-Soft/ngx-material-navigation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,53 @@
<div class="toolbar-row">
<div class="toolbar-col">
@for (element of getNavbarElements(row, 'left'); track element.id) {
<ngx-mat-navigation-element [class]="getElementClass(element)" [element]="element" [(sidenavOpened)]="sidenavOpened" (click)="clickSidenavElement(element)"></ngx-mat-navigation-element>
<ngx-mat-navigation-element
[ngClass]="{
'collapse-sm': element.collapse === 'sm' || element.collapse === undefined,
'collapse-md': element.collapse === 'md',
'collapse-lg': element.collapse === 'lg',
'collapse-always': element.collapse === 'always',
'collapse-never': element.collapse === 'never',
}"
[element]="element"
[(sidenavOpened)]="sidenavOpened"
(click)="clickSidenavElement(element)"
>
</ngx-mat-navigation-element>
}
</div>
<div class="toolbar-col">
@for (element of getNavbarElements(row, 'center'); track element.id) {
<ngx-mat-navigation-element [class]="getElementClass(element)" [element]="element" [(sidenavOpened)]="sidenavOpened" (click)="clickSidenavElement(element)"></ngx-mat-navigation-element>
<ngx-mat-navigation-element
[ngClass]="{
'collapse-sm': element.collapse === 'sm' || element.collapse === undefined,
'collapse-md': element.collapse === 'md',
'collapse-lg': element.collapse === 'lg',
'collapse-always': element.collapse === 'always',
'collapse-never': element.collapse === 'never',
}"
[element]="element"
[(sidenavOpened)]="sidenavOpened"
(click)="clickSidenavElement(element)"
>
</ngx-mat-navigation-element>
}
</div>
<div class="toolbar-col">
@for (element of getNavbarElements(row, 'right'); track element.id) {
<ngx-mat-navigation-element [class]="getElementClass(element)" [element]="element" [(sidenavOpened)]="sidenavOpened" (click)="clickSidenavElement(element)"></ngx-mat-navigation-element>
<ngx-mat-navigation-element
[ngClass]="{
'collapse-sm': element.collapse === 'sm' || element.collapse === undefined,
'collapse-md': element.collapse === 'md',
'collapse-lg': element.collapse === 'lg',
'collapse-always': element.collapse === 'always',
'collapse-never': element.collapse === 'never',
}"
[element]="element"
[(sidenavOpened)]="sidenavOpened"
(click)="clickSidenavElement(element)"
>
</ngx-mat-navigation-element>
}
@if ($index === 0) {
<ngx-mat-navigation-element [class]="getBurgerMenuClass()" [element]="burgerMenu"></ngx-mat-navigation-element>
Expand Down Expand Up @@ -51,7 +87,13 @@
@for (element of sidenavElements; track element.id) {
<div class="sidenav-row">
<ngx-mat-navigation-element
[class]="getElementClass(element)"
[ngClass]="{
'collapse-sm': element.collapse === 'sm' || element.collapse === undefined,
'collapse-md': element.collapse === 'md',
'collapse-lg': element.collapse === 'lg',
'collapse-always': element.collapse === 'always',
'collapse-never': element.collapse === 'never',
}"
[isSidenavElement]="true"
[element]="element"
[(sidenavOpened)]="sidenavOpened"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ export class NgxMatNavigationNavbarComponent implements AfterContentChecked {
}
}

// eslint-disable-next-line jsdoc/require-jsdoc
getElementClass(element: NavElement): string {
return `collapse-${element.collapse ?? 'sm'}`;
}

// eslint-disable-next-line jsdoc/require-jsdoc
getBurgerMenuClass(): string {
if (this.sidenavElements.find(e => e.collapse === 'always')) {
Expand Down