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.

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

add selection #13

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

add selection #13

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f80db4e
Merge pull request #2 from metonym/master
Amerlander Feb 21, 2021
ba3bdbd
Merge pull request #3 from Amerlander/master
Amerlander Feb 21, 2021
1f558b9
Introduce `selection`-function and `active`-class
Amerlander Feb 21, 2021
ad14cc6
Update Typeahead.d.ts
Amerlander Feb 21, 2021
8ae1947
reove `!important` from css
Amerlander Feb 21, 2021
3ee7b6e
Prevent disabled items from beeing selected
Amerlander Feb 21, 2021
3b67075
Update Typeahead.svelte
Amerlander Feb 21, 2021
1e365b8
Update Typeahead.svelte
Amerlander Feb 21, 2021
9c619f2
Update Typeahead.svelte
Amerlander Feb 21, 2021
0edd3eb
Update Typeahead.svelte
Amerlander Feb 21, 2021
e573e89
Update Typeahead.svelte
Amerlander Feb 21, 2021
f1e522f
Update Typeahead.svelte
Amerlander Feb 21, 2021
4258381
update readme
Feb 23, 2021
9ed60c9
Update Readme
Feb 23, 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
23 changes: 18 additions & 5 deletions src/Typeahead.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

/** @type {(item: Item) => Item} */
export let extract = (item) => item;

/** @type {(item: Item) => Item} */
export let selection = (item) => false;

/** @type {(item: Item) => Item} */
export let disable = (item) => false;
Expand Down Expand Up @@ -89,7 +92,11 @@
.filter(value, data, options)
.filter(({ score }) => score > 0)
.filter((result) => !filter(result.original))
.map((result) => ({ ...result, disabled: disable(result.original) }));
.map((result)=> ({
...result,
disabled: disable(result.original),
selected: selection(result.original)
}));
$: resultsId = results.map((result) => extract(result.original)).join("");
</script>

Expand Down Expand Up @@ -171,7 +178,8 @@
<li
role="option"
id="{id}-result"
class:selected={selectedIndex === i}
class:active={selectedIndex === i}
class:selected={result.selected}
class:disabled={result.disabled}
aria-selected={selectedIndex === i}
on:click={() => {
Expand Down Expand Up @@ -228,18 +236,23 @@
background-color: #cacaca;
}

.active,
li:not(:last-of-type).active {
border: #0f62fe 1px solid;
Copy link
Owner

Choose a reason for hiding this comment

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

I'm not keen on using a border for the active state. It causes the text of an active item to shift. I'd prefer keeping the existing style of using a background color to distinguish the active but not selected state.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great, what about this blue: #d8e9f3
image

}

.disabled {
opacity: 0.4;
cursor: not-allowed;
}

:global([data-svelte-search] label) {
[data-svelte-typeahead] :global([data-svelte-search] label) {
margin-bottom: 0.25rem;
display: inline-flex;
font-size: 0.875rem;
}

:global([data-svelte-search] input) {
[data-svelte-typeahead] :global([data-svelte-search] input) {
width: 100%;
padding: 0.5rem 0.75rem;
background: none;
Expand All @@ -249,7 +262,7 @@
border: 1px solid #e5e5e5;
}

:global([data-svelte-search] input:focus) {
[data-svelte-typeahead] :global([data-svelte-search] input:focus) {
outline-color: #0f62fe;
outline-offset: 2px;
outline-width: 1px;
Expand Down
5 changes: 5 additions & 0 deletions types/Typeahead.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ export interface TypeaheadProps extends SearchProps {
* @default (item) => item
*/
extract?: (item: Item) => Item;

/**
* @default (item) => item
*/
selection?: (item: Item) => Item;

/**
* @default (item) => false
Expand Down