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

Added compareWith input for select #310

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
5 changes: 5 additions & 0 deletions demo/src/app/pages/modules/select/select.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ export class SelectPage {
"Must return a <code>Promise</code>. " +
"This must be defined as an arrow function in your class."
},
{
name: "compareWith",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you name this function optionsCompare please to get it inline with optionsLookup?

type: "(o1:U, o2:U) => boolean",
description: "A function to compare two value types, it will be called when searching for values in the options."
},
{
name: "labelField",
type: "string",
Expand Down
13 changes: 13 additions & 0 deletions src/modules/select/classes/select-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export abstract class SuiSelectBase<T, U> implements AfterContentInit, OnDestroy
// Keep track of all of the subscriptions to the selected events on the rendered options.
private _renderedSubscriptions:Subscription[];

// Method used to compare the type of property of the option used as the value.
private _compareWith:(o1:U, o2:U) => boolean;

// Sets the Semantic UI classes on the host element.
@HostBinding("class.ui")
@HostBinding("class.dropdown")
Expand Down Expand Up @@ -132,6 +135,13 @@ export abstract class SuiSelectBase<T, U> implements AfterContentInit, OnDestroy
}
}

@Input()
public set compareWith(fn:(o1:U, o2:U) => boolean) {
if (fn) {
this._compareWith = fn;
}
}

public get filteredOptions():T[] {
return this.searchService.results;
}
Expand Down Expand Up @@ -331,6 +341,9 @@ export abstract class SuiSelectBase<T, U> implements AfterContentInit, OnDestroy
public abstract selectOption(option:T):void;

protected findOption(options:T[], value:U):T | undefined {
if (this._compareWith) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think rather than checking to see if the function has been assigned, it would be cleaner to initialise this property in the constructor with (a, b) => a === b , then you don't need this check.

return options.find(o => this._compareWith(value, this.valueGetter(o)));
}
// Tries to find an option in options array
return options.find(o => value === this.valueGetter(o));
}
Expand Down