mirror of
https://github.com/carbon-design-system/carbon-components-svelte.git
synced 2025-09-15 02:11:05 +00:00
refactor(toggle): forward events, inline functions
Supports #7 - Forward events - Add style prop - Remove exported props - Inline change, keyup functions - Dispatch only 'toggle' event
This commit is contained in:
parent
aceadbb55c
commit
ea39fdd4a7
4 changed files with 42 additions and 42 deletions
|
@ -3,7 +3,7 @@
|
||||||
export { className as class };
|
export { className as class };
|
||||||
export let id = undefined;
|
export let id = undefined;
|
||||||
export let labelText = undefined;
|
export let labelText = undefined;
|
||||||
export let props = {};
|
export let style = undefined;
|
||||||
|
|
||||||
import { cx } from '../../lib';
|
import { cx } from '../../lib';
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
const ariaLabel = labelText ? null : $$props['aria-label'] || 'Toggle is loading';
|
const ariaLabel = labelText ? null : $$props['aria-label'] || 'Toggle is loading';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div {...props} class={_class}>
|
<div on:click on:mouseover on:mouseenter on:mouseleave class={_class} {style}>
|
||||||
<input type="checkbox" class={cx('--toggle --skeleton')} {id} />
|
<input type="checkbox" class={cx('--toggle --skeleton')} {id} />
|
||||||
<label class={cx('--toggle__label', '--skeleton')} aria-label={ariaLabel} for={id}>
|
<label class={cx('--toggle__label', '--skeleton')} aria-label={ariaLabel} for={id}>
|
||||||
{#if labelText}
|
{#if labelText}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
export let labelText = undefined;
|
export let labelText = undefined;
|
||||||
export let labelA = 'Off';
|
export let labelA = 'Off';
|
||||||
export let labelB = 'On';
|
export let labelB = 'On';
|
||||||
export let props = {};
|
export let style = undefined;
|
||||||
|
|
||||||
import { createEventDispatcher } from 'svelte';
|
import { createEventDispatcher } from 'svelte';
|
||||||
import { cx } from '../../lib';
|
import { cx } from '../../lib';
|
||||||
|
@ -15,37 +15,37 @@
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
const _class = cx('--form-item', className);
|
const _class = cx('--form-item', className);
|
||||||
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle';
|
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle';
|
||||||
|
|
||||||
let inputRef = undefined;
|
let inputRef = undefined;
|
||||||
|
|
||||||
function handleChange(event) {
|
$: {
|
||||||
dispatch('change', event);
|
dispatch('toggle', { id, toggled });
|
||||||
dispatch('toggle', { checked: inputRef.checked, id, event });
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleKeyUp(event) {
|
if (inputRef) {
|
||||||
if (event.key === 'Enter') {
|
inputRef.checked = toggled;
|
||||||
if (inputRef) {
|
|
||||||
inputRef.checked = !inputRef.checked;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleChange(event);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class={_class}>
|
<div on:click on:mouseover on:mouseenter on:mouseleave class={_class} {style}>
|
||||||
<input
|
<input
|
||||||
{...props}
|
bind:this={inputRef}
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class={cx('--toggle-input')}
|
class={cx('--toggle-input')}
|
||||||
bind:this={inputRef}
|
|
||||||
checked={toggled}
|
checked={toggled}
|
||||||
{disabled}
|
|
||||||
{id}
|
|
||||||
on:change
|
on:change
|
||||||
on:change={handleChange}
|
on:change={() => {
|
||||||
|
toggled = !toggled;
|
||||||
|
}}
|
||||||
on:keyup
|
on:keyup
|
||||||
on:keyup={handleKeyUp} />
|
on:keyup={event => {
|
||||||
|
if (event.key === ' ' || event.key === 'Enter') {
|
||||||
|
event.preventDefault();
|
||||||
|
toggled = !toggled;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
{disabled}
|
||||||
|
{id} />
|
||||||
<label class={cx('--toggle-input__label')} for={id} aria-label={ariaLabel}>
|
<label class={cx('--toggle-input__label')} for={id} aria-label={ariaLabel}>
|
||||||
{labelText}
|
{labelText}
|
||||||
<span class={cx('--toggle__switch')}>
|
<span class={cx('--toggle__switch')}>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
export { className as class };
|
export { className as class };
|
||||||
export let id = undefined;
|
export let id = undefined;
|
||||||
export let labelText = undefined;
|
export let labelText = undefined;
|
||||||
export let props = {};
|
export let style = undefined;
|
||||||
|
|
||||||
import { cx } from '../../lib';
|
import { cx } from '../../lib';
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle is loading';
|
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle is loading';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div {...props} class={_class}>
|
<div on:click on:mouseover on:mouseenter on:mouseleave class={_class} {style}>
|
||||||
<input type="checkbox" class={cx('--toggle', '--toggle--small', '--skeleton')} {id} />
|
<input type="checkbox" class={cx('--toggle', '--toggle--small', '--skeleton')} {id} />
|
||||||
<label class={cx('--toggle__label --skeleton')} for={id}>
|
<label class={cx('--toggle__label --skeleton')} for={id}>
|
||||||
{#if labelText}
|
{#if labelText}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
export let labelText = undefined;
|
export let labelText = undefined;
|
||||||
export let labelA = 'Off';
|
export let labelA = 'Off';
|
||||||
export let labelB = 'On';
|
export let labelB = 'On';
|
||||||
export let props = {};
|
export let style = undefined;
|
||||||
|
|
||||||
import { createEventDispatcher } from 'svelte';
|
import { createEventDispatcher } from 'svelte';
|
||||||
import { cx } from '../../lib';
|
import { cx } from '../../lib';
|
||||||
|
@ -15,37 +15,37 @@
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
const _class = cx('--form-item', className);
|
const _class = cx('--form-item', className);
|
||||||
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle';
|
const ariaLabel = labelText ? undefined : $$props['aria-label'] || 'Toggle';
|
||||||
|
|
||||||
let inputRef = undefined;
|
let inputRef = undefined;
|
||||||
|
|
||||||
function handleChange(event) {
|
$: {
|
||||||
dispatch('change', event);
|
dispatch('toggle', { id, toggled });
|
||||||
dispatch('toggle', { checked: inputRef.checked, id, event });
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleKeyUp(event) {
|
if (inputRef) {
|
||||||
if (event.key === 'Enter') {
|
inputRef.checked = toggled;
|
||||||
if (inputRef) {
|
|
||||||
inputRef.checked = !inputRef.checked;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleChange(event);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class={_class}>
|
<div on:click on:mouseover on:mouseenter on:mouseleave class={_class} {style}>
|
||||||
<input
|
<input
|
||||||
{...props}
|
bind:this={inputRef}
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class={cx('--toggle-input', '--toggle-input--small')}
|
class={cx('--toggle-input', '--toggle-input--small')}
|
||||||
bind:this={inputRef}
|
|
||||||
checked={toggled}
|
checked={toggled}
|
||||||
{disabled}
|
|
||||||
{id}
|
|
||||||
on:change
|
on:change
|
||||||
on:change={handleChange}
|
on:change={() => {
|
||||||
|
toggled = !toggled;
|
||||||
|
}}
|
||||||
on:keyup
|
on:keyup
|
||||||
on:keyup={handleKeyUp} />
|
on:keyup={event => {
|
||||||
|
if (event.key === ' ' || event.key === 'Enter') {
|
||||||
|
event.preventDefault();
|
||||||
|
toggled = !toggled;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
{disabled}
|
||||||
|
{id} />
|
||||||
|
|
||||||
<label class={cx('--toggle-input__label')} for={id} aria-label={ariaLabel}>
|
<label class={cx('--toggle-input__label')} for={id} aria-label={ariaLabel}>
|
||||||
{labelText}
|
{labelText}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue