Skip to content

Commit 07be535

Browse files
cdransfcastastrophe
authored andcommitted
feat(avatar): migrate s2 avatar (#3355)
* chore(s2-avatar): initial commit * chore(s2-avatar): add sizing and border tokens
1 parent b991da7 commit 07be535

File tree

4 files changed

+80
-6
lines changed

4 files changed

+80
-6
lines changed

.changeset/friendly-dolls-raise.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@spectrum-css/avatar": major
3+
---
4+
5+
Adds support for new avatar-size tokens (avatar-size-800 to avatar-size-1500). Updates avatar component story to support new sizes. Adds support for avatar-border-color and avatar-border-thickness.

components/avatar/dist/metadata.json

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
"selectors": [
44
".spectrum-Avatar",
55
".spectrum-Avatar--size100",
6+
".spectrum-Avatar--size1000",
7+
".spectrum-Avatar--size1100",
8+
".spectrum-Avatar--size1200",
9+
".spectrum-Avatar--size1300",
10+
".spectrum-Avatar--size1400",
11+
".spectrum-Avatar--size1500",
612
".spectrum-Avatar--size200",
713
".spectrum-Avatar--size300",
814
".spectrum-Avatar--size400",
@@ -11,6 +17,8 @@
1117
".spectrum-Avatar--size600",
1218
".spectrum-Avatar--size700",
1319
".spectrum-Avatar--size75",
20+
".spectrum-Avatar--size800",
21+
".spectrum-Avatar--size900",
1422
".spectrum-Avatar-image",
1523
".spectrum-Avatar-link",
1624
".spectrum-Avatar.is-disabled",
@@ -29,7 +37,11 @@
2937
],
3038
"component": [
3139
"--spectrum-avatar-block-size",
40+
"--spectrum-avatar-border-color",
41+
"--spectrum-avatar-border-color-default",
3242
"--spectrum-avatar-border-radius",
43+
"--spectrum-avatar-border-thickness",
44+
"--spectrum-avatar-border-width",
3345
"--spectrum-avatar-color-opacity",
3446
"--spectrum-avatar-color-opacity-disabled",
3547
"--spectrum-avatar-focus-indicator-color",
@@ -38,14 +50,22 @@
3850
"--spectrum-avatar-inline-size",
3951
"--spectrum-avatar-opacity-disabled",
4052
"--spectrum-avatar-size-100",
53+
"--spectrum-avatar-size-1000",
54+
"--spectrum-avatar-size-1100",
55+
"--spectrum-avatar-size-1200",
56+
"--spectrum-avatar-size-1300",
57+
"--spectrum-avatar-size-1400",
58+
"--spectrum-avatar-size-1500",
4159
"--spectrum-avatar-size-200",
4260
"--spectrum-avatar-size-300",
4361
"--spectrum-avatar-size-400",
4462
"--spectrum-avatar-size-50",
4563
"--spectrum-avatar-size-500",
4664
"--spectrum-avatar-size-600",
4765
"--spectrum-avatar-size-700",
48-
"--spectrum-avatar-size-75"
66+
"--spectrum-avatar-size-75",
67+
"--spectrum-avatar-size-800",
68+
"--spectrum-avatar-size-900"
4969
],
5070
"global": [
5171
"--spectrum-focus-indicator-color",
@@ -54,5 +74,8 @@
5474
],
5575
"system-theme": [],
5676
"passthroughs": [],
57-
"high-contrast": ["--highcontrast-avatar-focus-indicator-color"]
77+
"high-contrast": [
78+
"--highcontrast-avatar-color-opacity-disabled",
79+
"--highcontrast-avatar-focus-indicator-color"
80+
]
5881
}

components/avatar/index.css

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
--spectrum-avatar-block-size: var(--spectrum-avatar-size-100);
1919

2020
--spectrum-avatar-border-radius: var(--spectrum-avatar-block-size);
21+
--spectrum-avatar-border-thickness: var(--spectrum-avatar-border-width);
22+
--spectrum-avatar-border-color-default: var(--spectrum-avatar-border-color);
2123

2224
--spectrum-avatar-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
2325
--spectrum-avatar-focus-indicator-gap: var(--spectrum-focus-indicator-gap);
@@ -71,6 +73,46 @@
7173
--spectrum-avatar-block-size: var(--spectrum-avatar-size-700);
7274
}
7375

76+
.spectrum-Avatar--size800 {
77+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-800);
78+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-800);
79+
}
80+
81+
.spectrum-Avatar--size900 {
82+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-900);
83+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-900);
84+
}
85+
86+
.spectrum-Avatar--size1000 {
87+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1000);
88+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1000);
89+
}
90+
91+
.spectrum-Avatar--size1100 {
92+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1100);
93+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1100);
94+
}
95+
96+
.spectrum-Avatar--size1200 {
97+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1200);
98+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1200);
99+
}
100+
101+
.spectrum-Avatar--size1300 {
102+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1300);
103+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1300);
104+
}
105+
106+
.spectrum-Avatar--size1400 {
107+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1400);
108+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1400);
109+
}
110+
111+
.spectrum-Avatar--size1500 {
112+
--spectrum-avatar-inline-size: var(--spectrum-avatar-size-1500);
113+
--spectrum-avatar-block-size: var(--spectrum-avatar-size-1500);
114+
}
115+
74116
@media (forced-colors: active) {
75117
.spectrum-Avatar {
76118
--highcontrast-avatar-focus-indicator-color: CanvasText;
@@ -83,8 +125,10 @@
83125
inline-size: var(--mod-avatar-inline-size, var(--spectrum-avatar-inline-size));
84126
block-size: var(--mod-avatar-block-size, var(--spectrum-avatar-block-size));
85127

128+
border-style: solid;
86129
border-radius: var(--mod-avatar-border-radius, var(--spectrum-avatar-border-radius));
87-
border-width: 0;
130+
border-width: var(--spectrum-avatar-border-thickness);
131+
border-color: var(--spectrum-avatar-border-color-default);
88132

89133
outline: none;
90134

@@ -96,7 +140,7 @@
96140
opacity: var(--mod-avatar-color-opacity, var(--spectrum-avatar-color-opacity));
97141

98142
&.is-disabled {
99-
opacity: var(--mod-avatar-color-opacity-disabled, var(--spectrum-avatar-color-opacity-disabled));
143+
opacity: var(--highcontrast-avatar-color-opacity-disabled, var(--mod-avatar-color-opacity-disabled, var(--spectrum-avatar-color-opacity-disabled)));
100144
}
101145
}
102146

@@ -120,7 +164,9 @@
120164
}
121165

122166
.spectrum-Avatar-link {
123-
outline: 0;
167+
outline: none;
168+
outline-color: transparent;
169+
outline-style: solid;
124170
}
125171

126172
.spectrum-Avatar-image {

components/avatar/stories/avatar.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default {
1313
title: "Avatar",
1414
component: "Avatar",
1515
argTypes: {
16-
size: size([50, 75, 100, 200, 300, 400, 500, 600, 700], false),
16+
size: size([50, 75, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500], false),
1717
image: {
1818
name: "Image",
1919
type: { name: "string" },

0 commit comments

Comments
 (0)