Skip to content

Commit

Permalink
Merge pull request #321 from SAP/feature/#320
Browse files Browse the repository at this point in the history
#320 refactored to add dropdown alignment and no arrow options
  • Loading branch information
mikerodonnell89 committed Nov 26, 2018
2 parents 66a205a + 8694d61 commit 5cfbe12
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,46 @@
</fd-menu-list>
</fd-menu>
</fd-popover-body>
</fd-popover>
</fd-popover>

<fd-popover [alignment]="'right'">
<fd-popover-control>
<button fd-button>Button</button>
</fd-popover-control>
<fd-popover-body>
<fd-menu>
<fd-menu-list>
<fd-menu-item>
<a [attr.href]="'#'">Option 1</a>
</fd-menu-item>
<fd-menu-item>
<a [routerLink]="'#'">Option 2</a>
</fd-menu-item>
<fd-menu-item>
Option 3
</fd-menu-item>
</fd-menu-list>
</fd-menu>
</fd-popover-body>
</fd-popover>

<fd-popover [arrow]='false' [alignment]="'right'">
<fd-popover-control>
<fd-image [size]="'l'" [circle]="true" [photo]="'https://placeimg.com/400/400/tech'"></fd-image>
</fd-popover-control>
<fd-popover-body>
<fd-menu>
<fd-menu-list>
<fd-menu-item>
<a [attr.href]="'#'">Option 1</a>
</fd-menu-item>
<fd-menu-item>
<a [routerLink]="'#'">Option 2</a>
</fd-menu-item>
<fd-menu-item>
Option 3
</fd-menu-item>
</fd-menu-list>
</fd-menu>
</fd-popover-body>
</fd-popover>
6 changes: 4 additions & 2 deletions library/src/lib/popover/popover.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<ng-container *ngTemplateOutlet="popoverBodyTpl"></ng-container>
</div>
</div>
<div *ngIf="!isDropdown" class="fd-popover">
<div *ngIf="!isDropdown" class="fd-popover"
[ngClass]="{ 'fd-popover--right' : alignment == 'right'}">
<div
#popoverControlWrapper
class="fd-popover__control"
Expand All @@ -40,7 +41,8 @@
<ng-template #popoverBodyTpl>
<div
class="fd-popover__body"
[ngClass]="{ 'fd-popover__body--no-arrow': isDropdown }"
[ngClass]="{ 'fd-popover__body--no-arrow': isDropdown || !arrow,
'fd-popover__body--right' : alignment == 'right' }"
[attr.aria-hidden]="disabled ? true : !isOpen"
>
<ng-content select="fd-popover-body"></ng-content>
Expand Down
4 changes: 4 additions & 0 deletions library/src/lib/popover/popover.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import { HashService } from '../utils/hash.service';
templateUrl: './popover.component.html'
})
export class PopoverComponent implements OnInit, AfterViewInit {
@Input()
alignment: string = '';
@Input()
arrow: boolean = true;
@Input()
disabled: boolean = false;
@Input()
Expand Down

0 comments on commit 5cfbe12

Please sign in to comment.