Skip to content

feat: Adding hover behaviour on select components #732

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 6 commits into from
Mar 31, 2021
Merged

feat: Adding hover behaviour on select components #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4eeae7
fix : Adding hovet behaviour for select
Mar 31, 2021
0e0c6b6
Merge branch 'main' into select-hover
Mar 31, 2021
8d89661
fix: lint errors
itssharmasandeep Mar 31, 2021
cf14323
fix: change hovere color for menu dropdown
itssharmasandeep Mar 31, 2021
f6e3bb6
fix: prettier errors
itssharmasandeep Mar 31, 2021
9d77269
fix: multi select icon mode style and some code refactoring
itssharmasandeep Mar 31, 2021
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
9 changes: 9 additions & 0 deletions projects/components/src/menu-dropdown/menu-dropdown.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
.trigger-label:not(:last-child) {
margin-right: 8px;
}

&:hover {
background-color: $gray-2;
border-radius: 50%;
}

&.labeled:hover {
border-radius: 6px;
}
}

.dropdown-content {
Expand Down
2 changes: 1 addition & 1 deletion projects/components/src/menu-dropdown/menu-dropdown.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { MenuItemComponent } from './menu-item/menu-item.component';
<ht-event-blocker event="click" [enabled]="true">
<ht-popover [closeOnClick]="true" [disabled]="this.disabled">
<ht-popover-trigger>
<div class="trigger-content" [ngClass]="{ disabled: this.disabled }">
<div class="trigger-content" [ngClass]="{ disabled: this.disabled, labeled: !!this.label }">
<ht-label *ngIf="this.label" class="trigger-label" [label]="this.label"> </ht-label>
<ht-icon *ngIf="this.icon" class="trigger-icon" [icon]="this.icon" size="${IconSize.Small}"></ht-icon>
</div>
Expand Down
13 changes: 13 additions & 0 deletions projects/components/src/multi-select/multi-select.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,20 @@
cursor: pointer;
height: 34px;

&.open {
background-color: $gray-2;
}

&.icon-mode {
border: 1px solid transparent;
border-radius: 64px;
padding: 0 4px;

&.open {
background: $blue-2;
border-color: $blue-3;
}

&:hover {
color: $blue-5;
background: $blue-1;
Expand All @@ -57,6 +66,10 @@
margin-left: auto;
}
}

&:hover {
background-color: $gray-1;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion projects/components/src/multi-select/multi-select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { MultiSelectJustify } from './multi-select-justify';
<div
class="trigger-content"
[style.justify-content]="this.justify"
[ngClass]="this.triggerLabelDisplayMode"
[ngClass]="[this.triggerLabelDisplayMode, this.popoverOpen ? 'open' : '']"
#triggerContainer
>
<ht-icon *ngIf="this.icon" [icon]="this.icon" [size]="this.iconSize"> </ht-icon>
Expand Down
20 changes: 20 additions & 0 deletions projects/components/src/select/select.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
height: 100%;
}

&.open {
background-color: $gray-2;
border-radius: 6px;
}

&.border {
&.group-right {
border-radius: 0 2px 2px 0;
Expand Down Expand Up @@ -93,6 +98,11 @@
margin-left: auto;
color: $gray-7;
}

&:hover {
background-color: $gray-1;
border-radius: 6px;
}
}

.icon-only {
Expand All @@ -111,6 +121,16 @@
}
}

&.open {
background-color: white;

.icon {
background: $blue-2;
border: 1px solid $blue-3;
border-radius: 50%;
}
}

&.selected {
color: $blue-5;
}
Expand Down
9 changes: 7 additions & 2 deletions projects/components/src/select/select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,17 @@ import { SelectSize } from './select-size';
this.groupPosition,
selected ? selected.style.toString() : '',
this.showBorder ? 'border' : '',
this.disabled ? 'disabled' : ''
this.disabled ? 'disabled' : '',
this.popoverOpen ? 'open' : ''
]"
*htLetAsync="this.selected$ as selected"
>
<ht-popover
[disabled]="this.disabled"
[closeOnClick]="true"
class="select-container"
(popoverOpen)="this.popoverOpen = true"
(popoverClose)="this.popoverOpen = false"
[ngSwitch]="this.triggerDisplayMode"
>
<ht-popover-trigger>
Expand All @@ -61,7 +64,7 @@ import { SelectSize } from './select-size';
<div
*ngSwitchCase="'${SelectTriggerDisplayMode.Icon}'"
class="trigger-content icon-only"
[ngClass]="this.selected !== undefined ? 'selected' : ''"
[ngClass]="{ selected: this.selected !== undefined, open: this.popoverOpen }"
>
<ht-icon
class="icon"
Expand Down Expand Up @@ -168,6 +171,8 @@ export class SelectComponent<V> implements AfterContentInit, OnChanges {

public topControlItems$?: Observable<SelectControlOptionComponent<V>[]>;

public popoverOpen: boolean = false;

public get justifyClass(): string {
if (this.justify !== undefined) {
return this.justify;
Expand Down