Skip to content

fix(top-bar): properly align end container (#DS-3886) #879

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
merged 3 commits into from
Jun 30, 2025
+371 −354
Merged

fix(top-bar): properly align end container (#DS-3886) #879

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
7de8050
fix(top-bar): properly align end container (#DS-3886)
NikGurev Jun 28, 2025
0fa25fb
fix(top-bar): after review
NikGurev Jun 30, 2025
c24cb0a
chore(top-bar): styles order & examples refactoring (#DS-3886) (#880)
NikGurev Jun 30, 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
5 changes: 4 additions & 1 deletion packages/components/overflow-items/overflow-items.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ export class KbqOverflowItemsResult extends ElementVisibilityManager {}
standalone: true,
selector: '[kbqOverflowItem]',
exportAs: 'kbqOverflowItem',
host: { class: 'kbq-overflow-item' }
host: {
class: 'kbq-overflow-item',
'[class.kbq-overflow-item_always-visible]': 'alwaysVisible()'
}
})
export class KbqOverflowItem extends ElementVisibilityManager {
/**
Expand Down
80 changes: 48 additions & 32 deletions packages/components/top-bar/top-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
@use '../core/styles/common/tokens';

@mixin _overflow-items-margins {
padding: var(--kbq-size-border-width);

> .kbq-overflow-item {
&:not(:last-of-type) {
margin-right: var(--kbq-top-bar-container-end-gap);
}

// apply margin if the last item needs to be alwaysVisible
&:last-of-type:is(.kbq-overflow-item_always-visible) + .kbq-overflow-items-result {
margin-left: var(--kbq-top-bar-container-end-gap);
}
}

.kbq-overflow-items-result:first-child {
margin-right: var(--kbq-top-bar-container-end-gap);
}
}

.kbq-top-bar {
display: flex;
align-items: center;
Expand All @@ -12,49 +31,46 @@
padding: var(--kbq-top-bar-padding-vertical) var(--kbq-top-bar-padding-horizontal);
border-radius: var(--kbq-top-bar-border-radius);

&.kbq-top-bar_with-shadow {
box-shadow: var(--kbq-top-bar-shadow-bottom);
transition: box-shadow var(--kbq-top-bar-shadow-transition);
}

.kbq-top-bar-spacer {
height: 100%;
flex: 0 0 var(--kbq-top-bar-spacer-min-width);
}

.kbq-top-bar-container__start {
display: flex;
gap: var(--kbq-top-bar-container-start-gap);
flex: 1 0 var(--kbq-top-bar-container-start-basis);
justify-content: flex-start;
min-width: 0;
}

.kbq-top-bar-container__end {
display: flex;
gap: var(--kbq-top-bar-container-end-gap);
justify-content: end;
}

.kbq-top-bar-container__with-overflow-items {
gap: unset;
justify-content: unset;
padding: 1px;
.kbq-top-bar-container {
&:has(> .kbq-overflow-items) {
gap: unset;
overflow: hidden;
}

> .kbq-overflow-item {
&:not(:last-of-type) {
margin-right: var(--kbq-top-bar-container-end-gap);
}
.kbq-overflow-items {
@include _overflow-items-margins;
}

// apply margin if the last item needs to be alwaysVisible
&:last-of-type:is([aria-hidden='false']) + .kbq-overflow-items-result {
margin-left: var(--kbq-top-bar-container-end-gap);
}
&.kbq-top-bar-container__start {
display: flex;
gap: var(--kbq-top-bar-container-start-gap);
flex: 1 0 var(--kbq-top-bar-container-start-basis);
justify-content: flex-start;
min-width: 0;
}

.kbq-overflow-items-result:first-child {
margin-right: var(--kbq-top-bar-container-end-gap);
&.kbq-top-bar-container__end {
display: flex;
gap: var(--kbq-top-bar-container-end-gap);
justify-content: end;
}
}

&.kbq-top-bar_with-shadow {
box-shadow: var(--kbq-top-bar-shadow-bottom);
transition: box-shadow var(--kbq-top-bar-shadow-transition);
&.kbq-top-bar-container__with-overflow-items {
gap: unset;
justify-content: unset;

@include _overflow-items-margins;
}
}

@include tokens.kbq-typography-level-to-styles-css-variables(typography, text-normal);
Expand Down
78 changes: 40 additions & 38 deletions packages/docs-examples/components/top-bar/top-bar-actions/top-bar-actions-example.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,47 +46,49 @@ type ExampleAction = {

<div kbqTopBarSpacer></div>

<div #kbqOverflowItems="kbqOverflowItems" kbqOverflowItems kbqTopBarContainer placement="end">
@for (action of actions; track action.id) {
<button
[kbqOverflowItem]="action.id"
[alwaysVisible]="action?.alwaysVisible"
[kbqStyle]="action.style"
[color]="action.color"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
[kbqTooltipDisabled]="canTooltipBeAppied(action)"
[kbqTooltip]="action.text || action.id"
kbq-button
>
@if (action.icon) {
<i [class]="action.icon" kbq-icon=""></i>
}
@if (canTooltipBeAppied(action)) {
{{ action.text }}
}
</button>
}
<div kbqTopBarContainer placement="end">
<div #kbqOverflowItems="kbqOverflowItems" kbqOverflowItems>
@for (action of actions; track action.id) {
<button
[kbqOverflowItem]="action.id"
[alwaysVisible]="action?.alwaysVisible"
[kbqStyle]="action.style"
[color]="action.color"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
[kbqTooltipDisabled]="canTooltipBeAppied(action)"
[kbqTooltip]="action.text || action.id"
kbq-button
>
@if (action.icon) {
<i [class]="action.icon" kbq-icon=""></i>
}
@if (canTooltipBeAppied(action)) {
{{ action.text }}
}
</button>
}

<div kbqOverflowItemsResult>
<button
[kbqStyle]="KbqButtonStyles.Transparent"
[color]="KbqComponentColors.Contrast"
[kbqDropdownTriggerFor]="appDropdown"
kbq-button
>
<i kbq-icon="kbq-ellipsis-horizontal_16"></i>
</button>
<div kbqOverflowItemsResult>
<button
[kbqStyle]="KbqButtonStyles.Transparent"
[color]="KbqComponentColors.Contrast"
[kbqDropdownTriggerFor]="appDropdown"
kbq-button
>
<i kbq-icon="kbq-ellipsis-horizontal_16"></i>
</button>

<kbq-dropdown #appDropdown="kbqDropdown">
@for (action of actions; track action.id) {
@if (kbqOverflowItems.hiddenItemIDs().has(action.id)) {
<button kbq-dropdown-item>
{{ action.text || action.id }}
</button>
<kbq-dropdown #appDropdown="kbqDropdown">
@for (action of actions; track action.id) {
@if (kbqOverflowItems.hiddenItemIDs().has(action.id)) {
<button kbq-dropdown-item>
{{ action.text || action.id }}
</button>
}
}
}
</kbq-dropdown>
</kbq-dropdown>
</div>
</div>
</div>
</kbq-top-bar>
Expand Down
109 changes: 53 additions & 56 deletions ...s/components/top-bar/top-bar-breadcrumbs-adaptive/top-bar-breadcrumbs-adaptive-example.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BreakpointObserver } from '@angular/cdk/layout';
import { ChangeDetectionStrategy, Component, inject, InjectionToken, OnInit, signal } from '@angular/core';
import { ChangeDetectionStrategy, Component, computed, inject, InjectionToken } from '@angular/core';
import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
import { RouterLink } from '@angular/router';
import { kbqBreadcrumbsConfigurationProvider, KbqBreadcrumbsModule } from '@koobiq/components/breadcrumbs';
Expand All @@ -10,6 +10,7 @@ import { KbqIconModule } from '@koobiq/components/icon';
import { KbqOverflowItemsModule } from '@koobiq/components/overflow-items';
import { KbqToolTipModule } from '@koobiq/components/tooltip';
import { KbqTopBarModule } from '@koobiq/components/top-bar';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';

interface ExampleLocalizedText {
Expand Down Expand Up @@ -91,54 +92,56 @@ const ExampleLocalizedData = new InjectionToken<Record<string | 'default', Examp
</nav>
</div>
<div kbqTopBarSpacer></div>
<div #kbqOverflowItems="kbqOverflowItems" kbqOverflowItems kbqTopBarContainer placement="end">
<button
[kbqStyle]="KbqButtonStyles.Transparent"
[color]="KbqComponentColors.Contrast"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
kbqOverflowItem="filter"
kbqTooltip="Filter"
kbq-button
>
<i kbq-icon="kbq-filter_16"></i>
</button>

<button
[kbqStyle]="KbqButtonStyles.Filled"
[color]="KbqComponentColors.ContrastFade"
[kbqTooltipDisabled]="isDesktop()"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
kbqOverflowItem="share"
kbqTooltip="Share"
kbq-button
>
@if (isDesktop()) {
Share
} @else {
<i kbq-icon="kbq-arrow-up-from-rectangle_16"></i>
}
</button>

<div kbqOverflowItemsResult>
<div kbqTopBarContainer placement="end">
<div #kbqOverflowItems="kbqOverflowItems" kbqOverflowItems>
<button
[kbqStyle]="KbqButtonStyles.Transparent"
[color]="KbqComponentColors.Contrast"
[kbqDropdownTriggerFor]="appDropdown"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
kbqOverflowItem="filter"
kbqTooltip="Filter"
kbq-button
>
<i kbq-icon="kbq-ellipsis-horizontal_16"></i>
<i kbq-icon="kbq-filter_16"></i>
</button>

<kbq-dropdown #appDropdown="kbqDropdown">
@if (kbqOverflowItems.hiddenItemIDs().has('filter')) {
<button kbq-dropdown-item>Filter</button>
}
@if (kbqOverflowItems.hiddenItemIDs().has('share')) {
<button kbq-dropdown-item>Share</button>
<button
[kbqStyle]="KbqButtonStyles.Filled"
[color]="KbqComponentColors.ContrastFade"
[kbqTooltipDisabled]="isDesktop()"
[kbqPlacement]="PopUpPlacements.Bottom"
[kbqTooltipArrow]="false"
kbqOverflowItem="share"
kbqTooltip="Share"
kbq-button
>
@if (isDesktop()) {
Share
} @else {
<i kbq-icon="kbq-arrow-up-from-rectangle_16"></i>
}
</kbq-dropdown>
</button>

<div kbqOverflowItemsResult>
<button
[kbqStyle]="KbqButtonStyles.Transparent"
[color]="KbqComponentColors.Contrast"
[kbqDropdownTriggerFor]="appDropdown"
kbq-button
>
<i kbq-icon="kbq-ellipsis-horizontal_16"></i>
</button>

<kbq-dropdown #appDropdown="kbqDropdown">
@if (kbqOverflowItems.hiddenItemIDs().has('filter')) {
<button kbq-dropdown-item>Filter</button>
}
@if (kbqOverflowItems.hiddenItemIDs().has('share')) {
<button kbq-dropdown-item>Share</button>
}
</kbq-dropdown>
</div>
</div>
</div>
</kbq-top-bar>
Expand All @@ -158,12 +161,8 @@ const ExampleLocalizedData = new InjectionToken<Record<string | 'default', Examp
}

.kbq-top-bar-container[placement='start'] {
min-width: 135px;
--kbq-top-bar-container-start-basis: 135px;
}

.kbq-top-bar-container[placement='end'] {
flex-grow: 0.3 !important;
min-width: 180px;
--kbq-top-bar-container-start-basis: 180px;
}
}

Expand Down Expand Up @@ -215,7 +214,7 @@ export class ExampleTopBarBreadcrumbs {
<div class="layout-margin-top-3xl layout-margin-bottom-l">
{{ text().rightSideCompression }}
</div>
<example-top-bar-breadcrumbs [style.width.px]="300" />
<example-top-bar-breadcrumbs [style.width.px]="342" />
`,
styles: `
div {
Expand All @@ -225,15 +224,13 @@ export class ExampleTopBarBreadcrumbs {
`,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class TopBarBreadcrumbsAdaptiveExample implements OnInit {
protected readonly localeService = inject(KBQ_LOCALE_SERVICE, { optional: true });
export class TopBarBreadcrumbsAdaptiveExample {
protected readonly data = inject(ExampleLocalizedData);
protected readonly localeId = toSignal(inject(KBQ_LOCALE_SERVICE, { optional: true })?.changes || of(''));

protected readonly text = signal(this.data.default);
protected readonly text = computed(() => {
const localeId = this.localeId();

ngOnInit() {
if (this.localeService) {
this.localeService.changes.subscribe((id: string) => this.text.set(this.data[id] || this.data.default));
}
}
return (localeId && this.data[localeId]) || this.data.default;
});
}
Loading