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

feat(list): igo-list-items can now be disabled #233

Merged
merged 1 commit into from
Nov 30, 2018
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
75 changes: 62 additions & 13 deletions projects/common/src/lib/list/list-item.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import {
selector: '[igoListItem]'
})
export class ListItemDirective {
static cls = 'igo-list-item-selected';

static selectedCls = 'igo-list-item-selected';
static disabledCls = 'igo-list-item-disabled';

@Input()
get color() {
Expand All @@ -31,16 +33,14 @@ export class ListItemDirective {
if (value === this._focused) {
return;
}
if (this.disabled) {
return;
}

value ? this.beforeFocus.emit(this) : this.beforeUnfocus.emit(this);

if (value) {
this.renderer.addClass(this.el.nativeElement, ListItemDirective.cls);
} else {
this.renderer.removeClass(this.el.nativeElement, ListItemDirective.cls);
}

this._focused = value;
this.toggleSelectedClass();

value ? this.focus.emit(this) : this.unfocus.emit(this);
}
Expand All @@ -54,30 +54,55 @@ export class ListItemDirective {
if (value === this._selected) {
return;
}
if (this.disabled) {
return;
}

value ? this.beforeSelect.emit(this) : this.beforeUnselect.emit(this);

if (value) {
this.renderer.addClass(this.el.nativeElement, ListItemDirective.cls);
} else {
this.renderer.removeClass(this.el.nativeElement, ListItemDirective.cls);
}

this._selected = value;
this._focused = value;
this.toggleSelectedClass();

value ? this.select.emit(this) : this.unselect.emit(this);
}
private _selected = false;

@Input()
get disabled() {
return this._disabled;
}
set disabled(value: boolean) {
if (value === this._disabled) {
return;
}

if (value === true) {
this.selected = false;
}

value ? this.beforeDisable.emit(this) : this.beforeEnable.emit(this);

this._disabled = value;
this.toggleDisabledClass();

value ? this.disable.emit(this) : this.enable.emit(this);
}
private _disabled = false;


@Output() beforeSelect = new EventEmitter<ListItemDirective>();
@Output() beforeFocus = new EventEmitter<ListItemDirective>();
@Output() beforeUnselect = new EventEmitter<ListItemDirective>();
@Output() beforeUnfocus = new EventEmitter<ListItemDirective>();
@Output() beforeDisable = new EventEmitter<ListItemDirective>();
@Output() beforeEnable = new EventEmitter<ListItemDirective>();
@Output() focus = new EventEmitter<ListItemDirective>();
@Output() unfocus = new EventEmitter<ListItemDirective>();
@Output() select = new EventEmitter<ListItemDirective>();
@Output() unselect = new EventEmitter<ListItemDirective>();
@Output() disable = new EventEmitter<ListItemDirective>();
@Output() enable = new EventEmitter<ListItemDirective>();

@HostListener('click')
onClick() {
Expand All @@ -91,4 +116,28 @@ export class ListItemDirective {

return this.el.nativeElement.offsetTop - padding;
}

private toggleSelectedClass() {
if (this.focused || this.selected) {
this.addCls(ListItemDirective.selectedCls);
} else {
this.removeCls(ListItemDirective.selectedCls);
}
}

private toggleDisabledClass() {
if (this.disabled) {
this.addCls(ListItemDirective.disabledCls);
} else {
this.removeCls(ListItemDirective.disabledCls);
}
}

private addCls(cls: string) {
this.renderer.addClass(this.el.nativeElement, cls);
}

private removeCls(cls: string) {
this.renderer.removeClass(this.el.nativeElement, cls);
}
}
2 changes: 1 addition & 1 deletion projects/common/src/lib/list/list.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ mat-list {
width: 40px;
}

:host mat-list.selectable >>> [igolistitem] mat-list-item:hover {
:host mat-list.selectable >>> [igolistitem]:not(.igo-list-item-disabled) mat-list-item:hover {
cursor: pointer;
}

Expand Down
31 changes: 25 additions & 6 deletions projects/common/src/lib/list/list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { ListItemDirective } from './list-item.directive';
styleUrls: ['./list.component.scss']
})
export class ListComponent implements AfterViewInit, OnInit, OnDestroy {

@Input()
get navigation() {
return this._navigation;
Expand Down Expand Up @@ -122,22 +123,40 @@ export class ListComponent implements AfterViewInit, OnInit, OnDestroy {
}

focusNext() {
const items = this.listItems.toArray();
let item;
let disabled = true;
let index = this.getFocusedIndex();
if (index === undefined) {
index = -1;
}

const items = this.listItems.toArray();
if (index !== items.length - 1) {
this.focus(items[index + 1]);
while (disabled && index < items.length) {
index += 1;
item = items[index];
disabled = item.disabled;
}

if (item !== undefined) {
this.focus(item);
}

}

focusPrevious() {
const index = this.getFocusedIndex();
const items = this.listItems.toArray();
if (index !== 0) {
this.focus(items[index - 1]);
let item;
let disabled = true;
let index = this.getFocusedIndex();

while (disabled && index > 0) {
index -= 1;
item = items[index];
disabled = item.disabled;
}

if (item !== undefined) {
this.focus(item);
}
}

Expand Down
8 changes: 6 additions & 2 deletions projects/common/src/lib/list/list.theming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@
color: mat-color($accent, default-contrast);
}

igo-list [igolistitem][color="primary"]:hover > mat-list-item {
igo-list [igolistitem].igo-list-item-disabled > mat-list-item {
color: rgba(0, 0, 0, 0.38);
}

igo-list [igolistitem][color="primary"]:not(.igo-list-item-disabled):hover > mat-list-item {
background-color: mat-color($primary, lighter);
color: mat-color($primary, default-contrast);
}

igo-list [igolistitem][color="accent"]:hover > mat-list-item {
igo-list [igolistitem][color="accent"]:not(.igo-list-item-disabled):hover > mat-list-item {
background-color: mat-color($accent, lighter);
color: mat-color($accent, default-contrast);
}
Expand Down