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(tooltip): add angular positions classes #2048

Merged
merged 4 commits into from
Oct 30, 2019
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 @@ -117,4 +117,34 @@ describe('NbAdjustableConnectedPositionStrategy', () => {
{ originX: 'end', originY: 'bottom', overlayX: 'end', overlayY: 'top', offsetY: 15 },
]));
});

it('should map left position to start', () => {
const withPositionsSpy = spyOn(strategy, 'withPositions').and.callThrough();

strategy.position(NbPosition.LEFT).adjustment(NbAdjustment.HORIZONTAL);

const overlayService: NbOverlayService = TestBed.get(NbOverlayService);
const overlayRef = overlayService.create({ positionStrategy: strategy });
overlayRef.attach(new NbComponentPortal(PortalComponent));

expect(withPositionsSpy).toHaveBeenCalledWith(jasmine.objectContaining([
{ originX: 'start', originY: 'center', overlayX: 'end', overlayY: 'center', offsetX: -15 },
{ originX: 'end', originY: 'center', overlayX: 'start', overlayY: 'center', offsetX: 15 },
]));
});

it('should map right position to end', () => {
const withPositionsSpy = spyOn(strategy, 'withPositions').and.callThrough();

strategy.position(NbPosition.RIGHT).adjustment(NbAdjustment.HORIZONTAL);

const overlayService: NbOverlayService = TestBed.get(NbOverlayService);
const overlayRef = overlayService.create({ positionStrategy: strategy });
overlayRef.attach(new NbComponentPortal(PortalComponent));

expect(withPositionsSpy).toHaveBeenCalledWith(jasmine.objectContaining([
{ originX: 'end', originY: 'center', overlayX: 'start', overlayY: 'center', offsetX: 15 },
{ originX: 'start', originY: 'center', overlayX: 'end', overlayY: 'center', offsetX: -15 },
]));
});
});
14 changes: 13 additions & 1 deletion src/framework/theme/components/cdk/overlay/overlay-position.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,23 @@ export class NbAdjustableConnectedPositionStrategy
}

protected reorderPreferredPositions(positions: NbPosition[]): NbPosition[] {
const startPositionIndex = positions.indexOf(this._position);
// Physical positions should be mapped to logical as adjustments use logical positions.
const startPositionIndex = positions.indexOf(this.mapToLogicalPosition(this._position));
const firstPart = positions.slice(startPositionIndex);
const secondPart = positions.slice(0, startPositionIndex);
return firstPart.concat(secondPart);
}

protected mapToLogicalPosition(position: NbPosition): NbPosition {
if (position === NbPosition.LEFT) {
return NbPosition.START;
}
if (position === NbPosition.RIGHT) {
return NbPosition.END;
}

return position;
}
}

export class NbGlobalPositionStrategy extends GlobalPositionStrategy {
Expand Down
112 changes: 102 additions & 10 deletions src/framework/theme/components/tooltip/tooltip.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

:host {
$arrow-size: 6px;
@import '../../styles/core/mixins';

$arrow-size: 6px;

:host {
z-index: 10000;

.content {
Expand Down Expand Up @@ -41,27 +43,117 @@
border-left: $arrow-size solid transparent;
border-right: $arrow-size solid transparent;
}
}

&.bottom .arrow {
top: -#{$arrow-size};
:host(.bottom) {
.arrow {
top: -$arrow-size;
left: calc(50% - #{$arrow-size});
}
}

&.left .arrow {
right: round(-$arrow-size - $arrow-size / 2.5);
:host(.bottom-start) {
.arrow {
top: -$arrow-size;
@include nb-ltr(right, $arrow-size);
@include nb-rtl(left, $arrow-size);
}
}

:host(.bottom-end) {
.arrow {
top: -$arrow-size;
@include nb-ltr(left, $arrow-size);
@include nb-rtl(right, $arrow-size);
}
}

:host(.left),
:host(.start) {
.arrow {
$inline-offset: round(-$arrow-size - $arrow-size / 2.5);
@include nb-ltr() {
right: $inline-offset;
transform: rotate(90deg);
};
@include nb-rtl() {
left: $inline-offset;
transform: rotate(270deg);
};
top: calc(50% - #{$arrow-size / 2.5});
}
}

:host(.start-top) {
.arrow {
right: round(-$arrow-size - $arrow-size / 2.5);
bottom: $arrow-size;
transform: rotate(90deg);
}
}

:host(.start-bottom) {
.arrow {
right: round(-$arrow-size - $arrow-size / 2.5);
top: $arrow-size;
transform: rotate(90deg);
}
}

&.top .arrow {
bottom: -#{$arrow-size};
:host(.top) {
.arrow {
bottom: -$arrow-size;
left: calc(50% - #{$arrow-size});
transform: rotate(180deg);
}
}

&.right .arrow {
left: round(-$arrow-size - $arrow-size / 2.5);
:host(.top-start) {
.arrow {
bottom: calc(-1 * #{$arrow-size} + 1px);
@include nb-ltr(right, $arrow-size);
@include nb-rtl(left, $arrow-size);
transform: rotate(180deg);
}
}

:host(.top-end) {
.arrow {
bottom: calc(-#{$arrow-size} + 1px);
@include nb-ltr(left, $arrow-size);
@include nb-rtl(right, $arrow-size);
transform: rotate(180deg);
}
}

:host(.right),
:host(.end) {
.arrow {
$inline-offset: round(-$arrow-size - $arrow-size / 2.5);
@include nb-ltr() {
left: $inline-offset;
transform: rotate(270deg);
};
@include nb-rtl() {
right: $inline-offset;
transform: rotate(90deg);
};
top: calc(50% - #{$arrow-size / 2.5});
}
}

:host(.end-top) {
.arrow {
left: calc(-#{$arrow-size} - #{$arrow-size} / 2.5);
bottom: $arrow-size;
transform: rotate(270deg);
}
}

:host(.end-bottom) {
.arrow {
left: calc(-#{$arrow-size} - #{$arrow-size} / 2.5);
top: $arrow-size;
transform: rotate(270deg);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<button nbTooltip="This is a tooltip" nbTooltipPlacement="top" nbButton>Top</button>
<button nbTooltip="This is a tooltip" nbTooltipPlacement="right" nbButton>Right</button>
<button nbTooltip="This is a tooltip" nbTooltipPlacement="end" nbButton>End</button>
<button nbTooltip="This is a tooltip" nbTooltipPlacement="bottom" nbButton>Bottom</button>
<button nbTooltip="This is a tooltip" nbTooltipPlacement="left" nbButton>Left</button>
<button nbTooltip="This is a tooltip" nbTooltipPlacement="start" nbButton>Start</button>