fix(select): subscribe to store

This commit is contained in:
Eric Liu 2019-12-31 16:15:43 -08:00
commit 0ea98b1447
3 changed files with 28 additions and 22 deletions

View file

@ -6,14 +6,17 @@
import SelectItem from './SelectItem.svelte'; import SelectItem from './SelectItem.svelte';
import SelectSkeleton from './Select.Skeleton.svelte'; import SelectSkeleton from './Select.Skeleton.svelte';
import SelectItemGroup from './SelectItemGroup.svelte'; import SelectItemGroup from './SelectItemGroup.svelte';
let selected = 'placeholder-item';
</script> </script>
<Layout> <Layout>
<div> <div>
{selected}
{#if story === 'skeleton'} {#if story === 'skeleton'}
<SelectSkeleton {...$$props} /> <SelectSkeleton {...$$props} />
{:else} {:else}
<Select {...$$props.select} id="select-1" defaultValue="placeholder-item"> <Select {...$$props.select} id="select-1" bind:selected>
<SelectItem value="placeholder-item" text="Choose an option" disabled hidden /> <SelectItem value="placeholder-item" text="Choose an option" disabled hidden />
<SelectItemGroup {...$$props.group} label="Category 1"> <SelectItemGroup {...$$props.group} label="Category 1">
<SelectItem value="option-1" text="Option 1" /> <SelectItem value="option-1" text="Option 1" />

View file

@ -1,17 +1,17 @@
<script> <script>
let className = undefined; let className = undefined;
export { className as class }; export { className as class };
export let disabled = false;
export let helperText = '';
export let hideLabel = false;
export let id = Math.random(); export let id = Math.random();
export let inline = false; export let inline = false;
export let labelText = '';
export let disabled = false;
export let defaultValue = undefined;
export let hideLabel = false;
export let invalid = false; export let invalid = false;
export let invalidText = ''; export let invalidText = '';
export let helperText = ''; export let labelText = '';
export let light = false; export let light = false;
export let noLabel = false; export let noLabel = false;
export let selected = undefined;
export let style = undefined; export let style = undefined;
import { createEventDispatcher, setContext } from 'svelte'; import { createEventDispatcher, setContext } from 'svelte';
@ -22,16 +22,15 @@
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
let selected = writable(defaultValue); let selectedValue = writable(selected);
setContext('Select', { selected }); setContext('Select', { selectedValue });
$: errorId = `error-${id}`; $: errorId = `error-${id}`;
$: selected = $selectedValue;
$: { $: {
selected.set(defaultValue); dispatch('change', $selectedValue);
dispatch('change', $selected);
} }
$: defaultValue = $selected;
</script> </script>
<div class={cx('--form-item')} {style}> <div class={cx('--form-item')} {style}>
@ -58,7 +57,7 @@
disabled={disabled || undefined} disabled={disabled || undefined}
aria-invalid={invalid || undefined} aria-invalid={invalid || undefined}
on:change={({ target }) => { on:change={({ target }) => {
selected.set(target.value); selectedValue.set(target.value);
}} }}
{id}> {id}>
<slot /> <slot />
@ -87,7 +86,7 @@
aria-invalid={invalid || undefined} aria-invalid={invalid || undefined}
on:change on:change
on:change={({ target }) => { on:change={({ target }) => {
selected.set(target.value); selectedValue.set(target.value);
}} }}
{id}> {id}>
<slot /> <slot />

View file

@ -1,24 +1,28 @@
<script> <script>
let className = undefined; let className = undefined;
export { className as class }; export { className as class };
export let value = '';
export let text = '';
export let disabled = false; export let disabled = false;
export let hidden = false; export let hidden = false;
export let style = undefined; export let style = undefined;
export let text = '';
export let value = '';
import { getContext } from 'svelte'; import { getContext } from 'svelte';
import { cx } from '../../lib'; import { cx } from '../../lib';
const ctx = getContext('Select') || getContext('TimePickerSelect'); const ctx = getContext('Select') || getContext('TimePickerSelect');
let selected = false;
const unsubscribe = ctx.selectedValue.subscribe(currentValue => {
if (currentValue === value) {
selected = true;
}
});
unsubscribe();
</script> </script>
<option <option class={cx('--select-option', className)} {value} {disabled} {hidden} {style} {selected}>
selected={ctx.$selected === value}
class={cx('--select-option', className)}
{value}
{disabled}
{hidden}
{style}>
{text} {text}
</option> </option>