Skip to content

EVOMRKT-9083: Подменю: поддержка новых состояний (v8) #1308

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

Merged
harlamenko merged 3 commits into from
Jun 1, 2026
Merged

EVOMRKT-9083: Подменю: поддержка новых состояний (v8) #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
174c3af
feat(evo-navbar): add ui states
May 29, 2026
58a2bc4
fix(evo-navbar-item): disable on tab + enter
Jun 1, 2026
3e7345c
fix(evo-navbar-item): add border on tab focus
Jun 1, 2026
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
8 changes: 7 additions & 1 deletion ...s/evo-ui-kit/src/lib/components/evo-navbar/evo-navbar-item/evo-navbar-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
evoDropdownOrigin
class="evo-navbar__link evo-navbar__link_external"
[class.evo-navbar__link_highlighted]="origin.isDropdownOpen"
[class.evo-navbar__link_disabled]="item.disabled"
(click)="toggle()"
(mouseleave)="handleMouseLeave()"
>
Expand All @@ -20,8 +21,10 @@
class="evo-navbar__link evo-navbar__link_external"
[attr.href]="item.href"
[attr.target]="item.target"
[attr.tabindex]="item.disabled ? -1 : null"
[class.evo-navbar__link_nested]="isNested"
[class.evo-navbar__link_highlighted]="origin.isDropdownOpen"
[class.evo-navbar__link_disabled]="item.disabled"
Comment thread
harlamenko marked this conversation as resolved.
(mouseenter)="open()"
(mouseleave)="handleMouseLeave()"
>
Expand All @@ -37,6 +40,7 @@
evoDropdownOrigin
class="evo-navbar__link"
[class.evo-navbar__link_highlighted]="origin.isDropdownOpen"
[class.evo-navbar__link_disabled]="item.disabled"
(click)="toggle()"
(mouseleave)="handleMouseLeave()"
>
Expand All @@ -49,10 +53,12 @@
#origin="evoDropdownOrigin"
evoDropdownOrigin
class="evo-navbar__link"
[attr.tabindex]="item.disabled ? -1 : null"
[class.evo-navbar__link_nested]="isNested"
[class.evo-navbar__link_highlighted]="origin.isDropdownOpen"
[class.evo-navbar__link_disabled]="item.disabled"
[routerLink]="item.routerLink"
[routerLinkActive]="isNested ? ['evo-navbar__link_active'] : []"
[routerLinkActive]="['evo-navbar__link_active']"
[routerLinkActiveOptions]="{exact: !!item.isExactPath}"
[preserveFragment]="!!item.preserveFragment"
[queryParamsHandling]="item.queryParamsHandling"
Expand Down
38 changes: 34 additions & 4 deletions ...s/evo-ui-kit/src/lib/components/evo-navbar/evo-navbar-item/evo-navbar-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ $evo-navbar-dropdown-max-width: 85vw;
}

.evo-navbar__link {
$root: &;

display: block;
flex-shrink: 0;
padding: 9px 8px;
Expand All @@ -18,11 +20,23 @@ $evo-navbar-dropdown-max-width: 85vw;
user-select: none;

@include media-tablet {
&:not(.evo-navbar__link_nested):hover {
&:not(.evo-navbar__link_nested):not(&_disabled):hover {
.evo-navbar__link-title {
background: $color-white;
}
}

&:focus-visible {
.evo-navbar__link-title {
outline: 2px solid $color-link;
}
}
}

&:not(&_disabled):not(&_nested):active {
.evo-navbar__link-title {
background: mix($color-black, $color-white, 1%);
}
}

&_nested {
Expand All @@ -34,19 +48,35 @@ $evo-navbar-dropdown-max-width: 85vw;
border-radius: 0;
}

&:hover {
&:not(#{$root}_disabled):not(#{$root}_active):hover {
background: $color-background-grey;
}

&:focus-visible {
.evo-navbar__link-title {
border-radius: 4px;
}
}

&.evo-navbar__link_active {
color: $color-white;
background: $color-primary;
}
}

&_highlighted {
&:not(&_disabled):not(&_nested) {
&#{$root}_highlighted, &#{$root}_active {
.evo-navbar__link-title {
background: $color-white;
}
}
}

&_disabled {
pointer-events: none;

.evo-navbar__link-title {
background: $color-white;
color: $color-disabled;
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...cts/evo-ui-kit/src/lib/components/evo-navbar/evo-navbar-item/evo-navbar-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ export class EvoNavbarItemComponent {
}

toggle(): void {
if (this.item.disabled) {
return;
}

if (this.isSubMenuOpen()) {
this.closeSubMenu.emit(this.dropdownOrigin);
} else {
Expand All @@ -59,7 +63,7 @@ export class EvoNavbarItemComponent {
}

open(): void {
if (!this.isSubMenuOpen()) {
if (!this.isSubMenuOpen() && !this.item.disabled) {
this.openSubMenu.emit(this.dropdownOrigin);
}
}
Expand All @@ -70,7 +74,7 @@ export class EvoNavbarItemComponent {
}
}

isSubMenuOpen() {
isSubMenuOpen(): boolean {
return this.dropdownOrigin.isDropdownOpen;
}

Expand Down
1 change: 1 addition & 0 deletions projects/evo-ui-kit/src/lib/components/evo-navbar/interfaces/nav-item-main-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ export interface NavItemMainInfo {
ngClass?: string | string[] | Set<string> | {[klass: string]: any};
title: string;
subItems?: NavItem[];
disabled?: boolean;
}
13 changes: 11 additions & 2 deletions src/stories/components/evo-navbar.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ export const Default: Story = {
title: 'Communication',
routerLink: '/nested',
subItems: [
{routerLink: '/nested/first', title: 'Sms'},
{routerLink: '/nested/first', title: 'Sms', disabled: true},
{routerLink: '/nested/second', title: 'Second'},
{href: 'https://ya.ru', title: 'ya.ru', target: '_blank'},
{href: 'https://ya.ru', title: 'ya.ru', target: '_blank', disabled: true},
],
},
{
Expand All @@ -44,6 +44,15 @@ export const Default: Story = {
{href: 'https://vk.com', title: 'vk.com', target: '_blank'},
],
},
{
title: 'Fully disabled with subItems',
href: '#',
disabled: true,
subItems: [
{href: 'https://ya.ru', title: 'ya.ru', target: '_blank'},
{href: 'https://vk.com', title: 'vk.com', target: '_blank'},
],
},
],
},
};
Loading