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.

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

fix: added scroll to navigation menu #1585 #1615

Merged
merged 6 commits into from
May 8, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

.prizm-navigation-menu-group {
--prizm-empty-message__padding: 16px 32px;
border-bottom: 1px solid var(--prizm-background-stroke);
ickisIckis marked this conversation as resolved.
Show resolved Hide resolved
border-top: 1px solid var(--prizm-background-stroke);

&_expanded:has(.empty-message) {
border-bottom: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,33 @@

<main class="prizm-navigation-menu__content groups-content" [ngClass]="settingsConfiguration.selectedSize">
<ng-container *ngIf="menuGroups.length; else noGroups">
<section class="groups-content__top">
<ng-content></ng-content>
<ng-content select="[top]"></ng-content>
</section>
<prizm-scrollbar class="scrollable">
<section class="groups-content__top">
<ng-content></ng-content>
<ng-content select="[top]"></ng-content>
</section>
</prizm-scrollbar>
<section class="groups-content__bottom">
<ng-content select="[bottom]"></ng-content>
</section>
</ng-container>

<ng-template #noGroups>
<div class="no-groups-content">
<prizm-navigation-menu-group
[groupId]="'prizm-navigation-menu-default-group'"
[hideGroupAppearance]="true"
[items]="items"
[toolbarExtraTemplate]="toolbarExtraTemplate"
[itemExtraTemplate]="itemExtraTemplate"
[searchConfig]="$any(menuSearchConfig$ | async)"
[toolbarConfig]="$any(menuToolbarConfig$ | async)"
[emptySearchResultMessageConfig]="$any(emptySearchResultMessageConfig$ | async)"
[emptyDataMessageConfig]="$any(emptyDataMessageConfig$ | async)"
></prizm-navigation-menu-group>
</div>
<prizm-scrollbar class="scrollable">
<div class="no-groups-content" [class.no-groups-content__empty]="!items?.length">
<prizm-navigation-menu-group
[groupId]="'prizm-navigation-menu-default-group'"
[hideGroupAppearance]="true"
[items]="items"
[toolbarExtraTemplate]="toolbarExtraTemplate"
[itemExtraTemplate]="itemExtraTemplate"
[searchConfig]="$any(menuSearchConfig$ | async)"
[toolbarConfig]="$any(menuToolbarConfig$ | async)"
[emptySearchResultMessageConfig]="$any(emptySearchResultMessageConfig$ | async)"
[emptyDataMessageConfig]="$any(emptyDataMessageConfig$ | async)"
></prizm-navigation-menu-group>
</div>
</prizm-scrollbar>
</ng-template>
</main>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

&__header {
overflow: hidden;
border-bottom: 1px solid var(--prizm-background-stroke);
}

&__content {
Expand Down Expand Up @@ -54,36 +53,30 @@
}
}

.no-groups-content {
overflow: auto;
.scrollable {
height: 100%;
}

.no-groups-content {
&__empty {
height: 100%;
}
}

.groups-content {
height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
overflow: hidden;
height: 100%;

&__top {
flex: 1;
overflow: auto;
display: flex;
flex-direction: column;
}

&__bottom {
flex-shrink: 1;
overflow: hidden;
}
}
}

&::-webkit-scrollbar {
width: 0px;
background: transparent;
}

&::-webkit-scrollbar-track {
background: transparent;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { PrizmNavigationMenuToolbarComponent } from '../prizm-navigation-menu-to
import { prizmIsTextOverflow } from '../../../../util';
import { PrizmIconsFullRegistry } from '@prizm-ui/icons/core';
import { prizmIconsGear8Edge, prizmIconsHouse } from '@prizm-ui/icons/full/source';
import { PrizmScrollbarComponent } from '../../../scrollbar';

@Component({
selector: 'prizm-navigation-menu',
Expand All @@ -58,6 +59,7 @@ import { prizmIconsGear8Edge, prizmIconsHouse } from '@prizm-ui/icons/full/sourc
PrizmNavigationMenuGroupComponent,
PrizmNavigationMenuToolbarComponent,
PrizmHintDirective,
PrizmScrollbarComponent,
],
providers: [PrizmNavigationMenuService, PrizmNavigationMenuToolbarService, PrizmDestroyService],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[class.bar_has-horizontal]="bars[1]"
prizmScrollbarWrapper
>
<div class="thumb" prizmScrollbar="vertical" prizmTheme></div>
<div class="thumb" prizmScrollbar="vertical"></div>
</div>
<div
class="bar bar_horizontal"
Expand All @@ -15,6 +15,6 @@
[class.bar_has-vertical]="bars[0]"
prizmScrollbarWrapper
>
<div class="thumb" prizmScrollbar="horizontal" prizmTheme></div>
<div class="thumb" prizmScrollbar="horizontal"></div>
</div>
</ng-container>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { PRIZM_ANIMATION_OPTIONS, PRIZM_SCROLL_REF } from '../../tokens';
import { AnimationOptions } from '@angular/animations';
import { PrizmAbstractTestId } from '../../abstract/interactive';
import { PrizmLetDirective } from '@prizm-ui/helpers';
import { PrizmThemeModule } from '@prizm-ui/theme';
import { PrizmScrollbarWrapperDirective } from './scrollbar-wrapper.directive';
import { PrizmScrollbarDirective } from './scrollbar.directive';

Expand All @@ -20,14 +19,7 @@ import { PrizmScrollbarDirective } from './scrollbar.directive';
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [prizmFadeIn],
standalone: true,
imports: [
NgIf,
AsyncPipe,
PrizmLetDirective,
PrizmThemeModule,
PrizmScrollbarWrapperDirective,
PrizmScrollbarDirective,
],
imports: [NgIf, AsyncPipe, PrizmLetDirective, PrizmScrollbarWrapperDirective, PrizmScrollbarDirective],
})
export class PrizmScrollControlsComponent extends PrizmAbstractTestId {
override readonly testId_ = 'ui_scroll_controls';
Expand Down
Loading