Skip to content

Commit 7c771ee

Browse files
committed
fixes and design changes
1 parent a438881 commit 7c771ee

File tree

3 files changed

+35
-51
lines changed

3 files changed

+35
-51
lines changed

v2/pink-sb/src/lib/CompoundTag/Child.svelte

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
1717
const dispatch = createEventDispatcher();
1818
const dismissFn = getContext<() => void>('compound-tag-dismiss');
19+
const size = getContext<'s' | 'm'>('compound-tag-size');
1920
</script>
2021

2122
<button
22-
class="child"
2323
class:code={variant === 'code'}
2424
class:selected
25-
class:disabled
25+
class:s={size === 's'}
2626
on:click
2727
on:click|capture={() => {
2828
if (dismiss) {
@@ -40,13 +40,13 @@
4040
<style lang="scss">
4141
@use '../../scss/mixins/transitions';
4242
43-
.child {
43+
button {
4444
@include transitions.common;
4545
4646
--p-compound-tag-child-font-family:
4747
var(--badge-font-family, var(--font-family-sansserif)), var(--sans-fallbacks);
4848
--p-compound-tag-child-font-size: var(--badge-font-size, var(--font-size-s));
49-
--p-compound-tag-child-padding-block: var(--badge-padding-block, var(--space-3));
49+
--p-compound-tag-child-padding-block: var(--badge-padding-block, var(--space-5));
5050
--p-compound-tag-child-padding-inline: var(--badge-padding-inline, var(--space-5));
5151
--p-compound-tag-child-gap: var(--badge-gap, var(--space-3));
5252
--p-compound-tag-child-color: var(--tag-color, var(--fgcolor-neutral-secondary));
@@ -78,13 +78,6 @@
7878
7979
cursor: pointer;
8080
81-
/* Ensure all content is properly aligned */
82-
> * {
83-
display: inline-flex;
84-
align-items: center;
85-
vertical-align: middle;
86-
}
87-
8881
&:last-child {
8982
border-right: none;
9083
}
@@ -116,17 +109,11 @@
116109
--p-compound-tag-child-background-color: var(--bgcolor-neutral-secondary);
117110
border: var(--border-width-s) solid var(--border-neutral-stronger);
118111
}
119-
}
120112
121-
/* Size variants */
122-
:global(.compound-tag.xs) .child {
123-
--p-compound-tag-child-font-size: var(--font-size-xs);
124-
--p-compound-tag-child-padding-block: var(--space-1);
125-
--p-compound-tag-child-padding-inline: var(--space-3);
126-
}
127-
128-
:global(.compound-tag.s) .child {
129-
--p-compound-tag-child-padding-block: var(--space-1);
130-
--p-compound-tag-child-padding-inline: var(--space-3);
113+
/* size variants */
114+
&.s {
115+
--p-compound-tag-child-padding-block: var(--space-2);
116+
--p-compound-tag-child-padding-inline: var(--space-3);
117+
}
131118
}
132119
</style>

v2/pink-sb/src/lib/CompoundTag/CompoundTag.svelte

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts">
22
type $$Props = {
3-
size?: 'xs' | 's' | 'm';
3+
size?: 's' | 'm';
44
};
55
66
import { setContext } from 'svelte';
@@ -13,16 +13,11 @@
1313
}
1414
1515
setContext('compound-tag-dismiss', handleDismiss);
16+
setContext('compound-tag-size', size);
1617
</script>
1718

1819
{#if visible}
19-
<div
20-
class="compound-tag"
21-
class:xs={size === 'xs'}
22-
class:s={size === 's'}
23-
class:m={size === 'm'}
24-
role="group"
25-
>
20+
<div class="compound-tag" class:s={size === 's'} role="group">
2621
<slot />
2722
</div>
2823
{/if}
@@ -36,7 +31,7 @@
3631
--p-compound-tag-font-family:
3732
var(--badge-font-family, var(--font-family-sansserif)), var(--sans-fallbacks);
3833
--p-compound-tag-font-size: var(--badge-font-size, var(--font-size-s));
39-
--p-compound-tag-padding-block: var(--badge-padding-block, var(--space-3));
34+
--p-compound-tag-padding-block: var(--badge-padding-block, var(--space-5));
4035
--p-compound-tag-padding-inline: var(--badge-padding-inline, var(--space-5));
4136
--p-compound-tag-gap: var(--badge-gap, var(--space-3));
4237
--p-compound-tag-color: var(--tag-color, var(--fgcolor-neutral-secondary));
@@ -54,14 +49,8 @@
5449
border-radius: var(--border-radius-XS, 6px);
5550
overflow: hidden;
5651
57-
&.xs {
58-
--p-compound-tag-font-size: var(--font-size-xs);
59-
--p-compound-tag-padding-block: var(--space-1);
60-
--p-compound-tag-padding-inline: var(--space-3);
61-
}
62-
6352
&.s {
64-
--p-compound-tag-padding-block: var(--space-1);
53+
--p-compound-tag-padding-block: var(--space-2);
6554
--p-compound-tag-padding-inline: var(--space-3);
6655
}
6756
}

v2/pink-sb/src/stories/CompoundTag.stories.svelte

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,27 @@
8282
</CompoundTagRoot>
8383
</Story>
8484

85-
<Story name="Small Size">
86-
<CompoundTagRoot size="s">
87-
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
88-
<CompoundTagChild on:click={() => console.log('Clicked is')}>is</CompoundTagChild>
89-
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
90-
</CompoundTagRoot>
91-
</Story>
92-
93-
<Story name="X-Small Size">
94-
<CompoundTagRoot size="xs">
95-
<CompoundTagChild on:click={() => console.log('Clicked Filter')}>Filter</CompoundTagChild>
96-
<CompoundTagChild on:click={() => console.log('Clicked Active')}>Active</CompoundTagChild>
97-
</CompoundTagRoot>
85+
<Story name="Sizes">
86+
<div
87+
style="display: flex; flex-direction: column; gap: var(--space-6); align-items: flex-start;"
88+
>
89+
<CompoundTagRoot size="s">
90+
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
91+
<CompoundTagChild on:click={() => console.log('Clicked is')}>is</CompoundTagChild>
92+
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
93+
<CompoundTagChild dismiss on:click={() => console.log('Clicked close')}
94+
><Icon icon={IconX} size="s" /></CompoundTagChild
95+
>
96+
</CompoundTagRoot>
97+
<CompoundTagRoot size="m">
98+
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
99+
<CompoundTagChild on:click={() => console.log('Clicked is')}>is</CompoundTagChild>
100+
<CompoundTagChild on:click={() => console.log('Clicked Tag')}>Tag</CompoundTagChild>
101+
<CompoundTagChild dismiss on:click={() => console.log('Clicked close')}
102+
><Icon icon={IconX} size="s" /></CompoundTagChild
103+
>
104+
</CompoundTagRoot>
105+
</div>
98106
</Story>
99107

100108
<Story name="With Disabled Child" let:args>

0 commit comments

Comments
 (0)