Skip to content

Commit 274a67f

Browse files
authored
fix(tooltip): tooltip in navbar (#DS-2909) (#308)
1 parent 97fc8e1 commit 274a67f

File tree

4 files changed

+39
-5
lines changed

4 files changed

+39
-5
lines changed

packages/components-dev/navbar/module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import { PopUpPlacements } from '@koobiq/components/core';
88
import { KbqDividerModule } from '@koobiq/components/divider';
99
import { KbqDropdownModule } from '@koobiq/components/dropdown';
1010
import { KbqFormFieldModule } from '@koobiq/components/form-field';
11+
import { KbqIconModule } from '@koobiq/components/icon';
1112
import { KbqInputModule } from '@koobiq/components/input';
1213
import { KbqLinkModule } from '@koobiq/components/link';
1314
import { KbqModalModule, KbqModalRef, KbqModalService } from '@koobiq/components/modal';
15+
import { KbqNavbar, KbqNavbarModule } from '@koobiq/components/navbar';
1416
import { KbqPopoverModule } from '@koobiq/components/popover';
1517
import { KbqToolTipModule } from '@koobiq/components/tooltip';
16-
import { KbqIconModule } from '../../components/icon';
17-
import { KbqNavbar, KbqNavbarModule } from '../../components/navbar';
1818

1919
@Component({
2020
selector: 'app',

packages/components/navbar/navbar-item.component.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,8 @@ export class KbqNavbarItem extends KbqTooltipTrigger implements AfterContentInit
454454
public navbarFocusableItem: KbqNavbarFocusableItem,
455455
private changeDetectorRef: ChangeDetectorRef,
456456
@Optional() private dropdownTrigger: KbqDropdownTrigger,
457-
@Optional() private bento: KbqNavbarBento
457+
@Optional() private bento: KbqNavbarBento,
458+
@Optional() private tooltip: KbqTooltipTrigger
458459
) {
459460
super();
460461

@@ -471,6 +472,13 @@ export class KbqNavbarItem extends KbqTooltipTrigger implements AfterContentInit
471472
this._trigger = `${PopUpTriggers.Hover}`;
472473

473474
this.navbarFocusableItem.setTooltip(this);
475+
476+
if (this.tooltip) {
477+
this.tooltip.arrow = false;
478+
this.tooltip.offset = 0;
479+
480+
this.tooltip['overlayConfig'].panelClass = 'kbq-tooltip-panel_horizontal-navbar';
481+
}
474482
}
475483

476484
ngAfterContentInit(): void {

packages/components/tooltip/tooltip.scss

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,32 @@
1010
$trigger-margin: 8px;
1111
$trigger-margin_without-arrow: 4px;
1212

13+
.kbq-tooltip-panel_horizontal-navbar {
14+
&:has(.kbq-tooltip_placement-top),
15+
&:has(.kbq-tooltip_placement-top-left),
16+
&:has(.kbq-tooltip_placement-top-right) {
17+
margin-bottom: 9px;
18+
}
19+
20+
&:has(.kbq-tooltip_placement-right),
21+
&:has(.kbq-tooltip_placement-right-top),
22+
&:has(.kbq-tooltip_placement-right-bottom) {
23+
margin-left: 9px;
24+
}
25+
26+
&:has(.kbq-tooltip_placement-bottom),
27+
&:has(.kbq-tooltip_placement-bottom-left),
28+
&:has(.kbq-tooltip_placement-bottom-right) {
29+
margin-top: 9px;
30+
}
31+
32+
&:has(.kbq-tooltip_placement-left),
33+
&:has(.kbq-tooltip_placement-left-top),
34+
&:has(.kbq-tooltip_placement-left-bottom) {
35+
margin-right: 9px;
36+
}
37+
}
38+
1339
.kbq-tooltip__inner {
1440
border-radius: kbq-css-variable(tooltip-size-border-radius);
1541
word-break: break-word;

tools/public_api_guard/components/navbar.api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export interface KbqNavbarFocusableItemEvent {
194194

195195
// @public (undocumented)
196196
export class KbqNavbarItem extends KbqTooltipTrigger implements AfterContentInit {
197-
constructor(rectangleElement: KbqNavbarRectangleElement, navbarFocusableItem: KbqNavbarFocusableItem, changeDetectorRef: ChangeDetectorRef, dropdownTrigger: KbqDropdownTrigger, bento: KbqNavbarBento);
197+
constructor(rectangleElement: KbqNavbarRectangleElement, navbarFocusableItem: KbqNavbarFocusableItem, changeDetectorRef: ChangeDetectorRef, dropdownTrigger: KbqDropdownTrigger, bento: KbqNavbarBento, tooltip: KbqTooltipTrigger);
198198
// (undocumented)
199199
get collapsable(): boolean;
200200
set collapsable(value: boolean);
@@ -241,7 +241,7 @@ export class KbqNavbarItem extends KbqTooltipTrigger implements AfterContentInit
241241
// (undocumented)
242242
static ɵcmp: i0.ɵɵComponentDeclaration<KbqNavbarItem, "kbq-navbar-item, [kbq-navbar-item]", ["kbqNavbarItem"], { "collapsedText": { "alias": "collapsedText"; "required": false; }; "trigger": { "alias": "kbqTrigger"; "required": false; }; "collapsable": { "alias": "collapsable"; "required": false; }; }, {}, ["title", "icon"], ["[kbq-icon]", "kbq-navbar-title, [kbq-navbar-title]", "*"], false, never>;
243243
// (undocumented)
244-
static ɵfac: i0.ɵɵFactoryDeclaration<KbqNavbarItem, [null, null, null, { optional: true; }, { optional: true; }]>;
244+
static ɵfac: i0.ɵɵFactoryDeclaration<KbqNavbarItem, [null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
245245
}
246246

247247
// @public (undocumented)

0 commit comments

Comments
 (0)