From 0801e1d078d5eb1dd795494d9a19dfff43a6b487 Mon Sep 17 00:00:00 2001 From: metonym Date: Sun, 29 May 2022 08:16:27 -0700 Subject: [PATCH] refactor: prefer class directive over class attribute (#1318) --- src/Accordion/AccordionSkeleton.svelte | 6 +++--- src/DatePicker/DatePicker.svelte | 9 +++++---- src/Dropdown/Dropdown.svelte | 2 +- src/FileUploader/FileUploaderButton.svelte | 6 +++++- src/MultiSelect/MultiSelect.svelte | 2 +- src/NumberInput/NumberInput.svelte | 3 ++- src/Select/Select.svelte | 6 ++++-- src/TextInput/PasswordInput.svelte | 12 +++++++++--- src/TextInput/TextInput.svelte | 6 ++++-- 9 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/Accordion/AccordionSkeleton.svelte b/src/Accordion/AccordionSkeleton.svelte index 770f0f44..d9a71b8e 100644 --- a/src/Accordion/AccordionSkeleton.svelte +++ b/src/Accordion/AccordionSkeleton.svelte @@ -44,7 +44,7 @@ -
+
@@ -52,8 +52,8 @@ {/if} {#each Array.from({ length: open ? count - 1 : count }, (_, i) => i) as item (item)} -
  • - +
  • + diff --git a/src/DatePicker/DatePicker.svelte b/src/DatePicker/DatePicker.svelte index 3443dc5e..00740f78 100644 --- a/src/DatePicker/DatePicker.svelte +++ b/src/DatePicker/DatePicker.svelte @@ -247,10 +247,11 @@ class:bx--date-picker="{true}" class:bx--date-picker--short="{short}" class:bx--date-picker--light="{light}" - class="{datePickerType && `bx--date-picker--${datePickerType}`} - {datePickerType === 'range' && - $labelTextEmpty && - 'bx--date-picker--nolabel'}" + class:bx--date-picker--simple="{datePickerType === 'simple'}" + class:bx--date-picker--single="{datePickerType === 'single'}" + class:bx--date-picker--range="{datePickerType === 'range'}" + class:bx--date-picker--nolabel="{datePickerType === 'range' && + $labelTextEmpty}" on:keydown="{(e) => { if (calendar?.isOpen && e.key === 'Escape') { e.stopPropagation(); diff --git a/src/Dropdown/Dropdown.svelte b/src/Dropdown/Dropdown.svelte index e93fce46..907182d7 100644 --- a/src/Dropdown/Dropdown.svelte +++ b/src/Dropdown/Dropdown.svelte @@ -231,7 +231,7 @@ translateWithId="{translateWithId}" id="{id}" > - + {#if selectedItem}{itemToString(selectedItem)}{:else}{label}{/if} {label} + {label} {/if} diff --git a/src/NumberInput/NumberInput.svelte b/src/NumberInput/NumberInput.svelte index 7504a32b..84b046a3 100644 --- a/src/NumberInput/NumberInput.svelte +++ b/src/NumberInput/NumberInput.svelte @@ -168,7 +168,8 @@ class:bx--number--light="{light}" class:bx--number--nolabel="{hideLabel}" class:bx--number--nosteppers="{hideSteppers}" - class="{size && `bx--number--${size}`}" + class:bx--number--sm="{size === 'sm'}" + class:bx--number--xl="{size === 'xl'}" > {#if $$slots.label || label}