fix icon color inheritance, tweak select chevron
This commit is contained in:
parent
bc67d22c4b
commit
fcc0a884f5
2 changed files with 9 additions and 15 deletions
|
|
@ -48,11 +48,11 @@
|
|||
</script>
|
||||
|
||||
{#if !loading && svgContent}
|
||||
<span
|
||||
<span
|
||||
class="icon {className}"
|
||||
style="width: {typeof size === 'number' ? `${size}px` : size};
|
||||
style="width: {typeof size === 'number' ? `${size}px` : size};
|
||||
height: {typeof size === 'number' ? `${size}px` : size};
|
||||
color: {color};
|
||||
{color !== 'currentColor' ? `color: ${color};` : ''}
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;"
|
||||
|
|
|
|||
|
|
@ -58,13 +58,7 @@
|
|||
)
|
||||
|
||||
const selectClasses = $derived(
|
||||
[
|
||||
'select',
|
||||
size,
|
||||
contained && 'contained',
|
||||
fullWidth && 'full',
|
||||
disabled && 'disabled'
|
||||
]
|
||||
['select', size, contained && 'contained', fullWidth && 'full', disabled && 'disabled']
|
||||
.filter(Boolean)
|
||||
.join(' ')
|
||||
)
|
||||
|
|
@ -94,7 +88,7 @@
|
|||
|
||||
<SelectPrimitive.Root
|
||||
type="single"
|
||||
{...(value !== undefined && value !== null ? { value: String(value) } : {})}
|
||||
{...value !== undefined && value !== null ? { value: String(value) } : {}}
|
||||
onValueChange={handleValueChange}
|
||||
{disabled}
|
||||
items={stringOptions}
|
||||
|
|
@ -112,7 +106,7 @@
|
|||
{#each options as option}
|
||||
<SelectPrimitive.Item
|
||||
value={String(option.value)}
|
||||
{...(option.disabled !== undefined ? { disabled: option.disabled } : {})}
|
||||
{...option.disabled !== undefined ? { disabled: option.disabled } : {}}
|
||||
class="item"
|
||||
>
|
||||
{#snippet children({ selected })}
|
||||
|
|
@ -139,7 +133,7 @@
|
|||
{:else}
|
||||
<SelectPrimitive.Root
|
||||
type="single"
|
||||
{...(value !== undefined && value !== null ? { value: String(value) } : {})}
|
||||
{...value !== undefined && value !== null ? { value: String(value) } : {}}
|
||||
onValueChange={handleValueChange}
|
||||
{disabled}
|
||||
items={stringOptions}
|
||||
|
|
@ -157,7 +151,7 @@
|
|||
{#each options as option}
|
||||
<SelectPrimitive.Item
|
||||
value={String(option.value)}
|
||||
{...(option.disabled !== undefined ? { disabled: option.disabled } : {})}
|
||||
{...option.disabled !== undefined ? { disabled: option.disabled } : {}}
|
||||
class="item"
|
||||
>
|
||||
{#snippet children({ selected })}
|
||||
|
|
@ -305,7 +299,7 @@
|
|||
|
||||
:global(.chevron) {
|
||||
flex-shrink: 0;
|
||||
color: var(--text-secondary);
|
||||
color: var(--text-tertiary);
|
||||
margin-left: auto;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue