From 90bd2a10b7c00c3eb29d205d1945ed80db5975b5 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Sat, 5 Dec 2020 16:45:42 -0800 Subject: [PATCH] feat(select-item): spread rest props, avoid $ variable name --- docs/src/COMPONENT_API.json | 3 ++- src/Select/SelectItem.svelte | 7 +++---- types/Select/SelectItem.d.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json index dc82da55..65c2cc59 100644 --- a/docs/src/COMPONENT_API.json +++ b/docs/src/COMPONENT_API.json @@ -6428,7 +6428,8 @@ ], "slots": [], "events": [], - "typedefs": [] + "typedefs": [], + "rest_props": { "type": "Element", "name": "option" } }, { "moduleName": "SelectItemGroup", diff --git a/src/Select/SelectItem.svelte b/src/Select/SelectItem.svelte index 44fd8ee9..9e76df8c 100644 --- a/src/Select/SelectItem.svelte +++ b/src/Select/SelectItem.svelte @@ -17,8 +17,8 @@ let selected = false; - const unsubscribe = ctx.selectedValue.subscribe(($) => { - selected = $ === value; + const unsubscribe = ctx.selectedValue.subscribe((currentValue) => { + selected = currentValue === value; }); onDestroy(() => { @@ -32,8 +32,7 @@ hidden="{hidden}" selected="{selected}" class:bx--select-option="{true}" - class="{$$restProps.class}" - style="{$$restProps.style}" + {...$$restProps} > {text || value} diff --git a/types/Select/SelectItem.d.ts b/types/Select/SelectItem.d.ts index b08ba976..59fe939b 100644 --- a/types/Select/SelectItem.d.ts +++ b/types/Select/SelectItem.d.ts @@ -1,6 +1,6 @@ /// -export interface SelectItemProps { +export interface SelectItemProps extends svelte.JSX.HTMLAttributes { /** * Specify the option value * @default ""