refactor(toggle): remove dispatch, inputRef, afterUpdate

This commit is contained in:
Eric Liu 2019-12-29 19:25:54 -08:00
commit 4b1ed0adce
5 changed files with 19 additions and 26 deletions

View file

@ -11,7 +11,7 @@
<div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}> <div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}>
<input type="checkbox" class={cx('--toggle --skeleton')} {id} /> <input type="checkbox" class={cx('--toggle --skeleton')} {id} />
<label <label
aria-label={labelText ? null : $$props['aria-label'] || 'Toggle is loading'} aria-label={labelText ? undefined : $$props['aria-label'] || 'Toggle is loading'}
class={cx('--toggle__label', '--skeleton')} class={cx('--toggle__label', '--skeleton')}
for={id}> for={id}>
{#if labelText} {#if labelText}

View file

@ -4,11 +4,17 @@
import Layout from '../../internal/ui/Layout.svelte'; import Layout from '../../internal/ui/Layout.svelte';
import Toggle from './Toggle.svelte'; import Toggle from './Toggle.svelte';
import ToggleSkeleton from './Toggle.Skeleton.svelte'; import ToggleSkeleton from './Toggle.Skeleton.svelte';
let toggled = true;
$: {
console.log('toggled', toggled);
}
</script> </script>
<Layout> <Layout>
{#if story === 'toggled'} {#if story === 'toggled'}
<Toggle {...$$props} id="toggle-1" toggled /> <Toggle {...$$props} id="toggle-1" bind:toggled />
{:else if story === 'skeleton'} {:else if story === 'skeleton'}
<ToggleSkeleton /> <ToggleSkeleton />
{:else} {:else}

View file

@ -9,22 +9,11 @@
export let labelB = 'On'; export let labelB = 'On';
export let style = undefined; export let style = undefined;
import { createEventDispatcher, afterUpdate } from 'svelte';
import { cx } from '../../lib'; import { cx } from '../../lib';
const dispatch = createEventDispatcher();
let inputRef = undefined;
afterUpdate(() => {
inputRef.checked = toggled;
dispatch('toggle', { id, toggled });
});
</script> </script>
<div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}> <div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}>
<input <input
bind:this={inputRef}
type="checkbox" type="checkbox"
class={cx('--toggle-input')} class={cx('--toggle-input')}
checked={toggled} checked={toggled}
@ -39,6 +28,8 @@
toggled = !toggled; toggled = !toggled;
} }
}} }}
on:focus
on:blur
{disabled} {disabled}
{id} /> {id} />
<label <label

View file

@ -4,11 +4,17 @@
import Layout from '../../internal/ui/Layout.svelte'; import Layout from '../../internal/ui/Layout.svelte';
import ToggleSmall from './ToggleSmall.svelte'; import ToggleSmall from './ToggleSmall.svelte';
import ToggleSmallSkeleton from './ToggleSmall.Skeleton.svelte'; import ToggleSmallSkeleton from './ToggleSmall.Skeleton.svelte';
let toggled = true;
$: {
console.log('toggled', toggled);
}
</script> </script>
<Layout> <Layout>
{#if story === 'toggled'} {#if story === 'toggled'}
<ToggleSmall {...$$props} id="toggle-1" toggled /> <ToggleSmall {...$$props} id="toggle-1" bind:toggled />
{:else if story === 'skeleton'} {:else if story === 'skeleton'}
<ToggleSmallSkeleton /> <ToggleSmallSkeleton />
{:else} {:else}

View file

@ -9,22 +9,11 @@
export let labelB = 'On'; export let labelB = 'On';
export let style = undefined; export let style = undefined;
import { createEventDispatcher, afterUpdate } from 'svelte';
import { cx } from '../../lib'; import { cx } from '../../lib';
const dispatch = createEventDispatcher();
let inputRef = undefined;
afterUpdate(() => {
inputRef.checked = toggled;
dispatch('toggle', { id, toggled });
});
</script> </script>
<div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}> <div on:click on:mouseover on:mouseenter on:mouseleave class={cx('--form-item', className)} {style}>
<input <input
bind:this={inputRef}
type="checkbox" type="checkbox"
class={cx('--toggle-input', '--toggle-input--small')} class={cx('--toggle-input', '--toggle-input--small')}
checked={toggled} checked={toggled}
@ -39,9 +28,10 @@
toggled = !toggled; toggled = !toggled;
} }
}} }}
on:focus
on:blur
{disabled} {disabled}
{id} /> {id} />
<label <label
aria-label={labelText ? undefined : $$props['aria-label'] || 'Toggle'} aria-label={labelText ? undefined : $$props['aria-label'] || 'Toggle'}
class={cx('--toggle-input__label')} class={cx('--toggle-input__label')}