Skip to content

Commit d7133a7

Browse files
aramos-adobecastastrophe
authored andcommitted
feat(progresscircle): resolving comments
1 parent 76cf80c commit d7133a7

File tree

3 files changed

+20
-32
lines changed

3 files changed

+20
-32
lines changed

components/progresscircle/dist/metadata.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4-
".spectrum-Circle",
54
".spectrum-ProgressCircle",
65
".spectrum-ProgressCircle--indeterminate .spectrum-ProgressCircle-fill",
76
".spectrum-ProgressCircle--sizeL",
@@ -47,7 +46,6 @@
4746
"passthroughs": [],
4847
"high-contrast": [
4948
"--highcontrast-progress-circle-fill-border-color",
50-
"--highcontrast-progress-circle-fill-border-color-over-background",
51-
"--highcontrast-progressbar-track-color"
49+
"--highcontrast-progress-circle-track-color"
5250
]
5351
}

components/progresscircle/index.css

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,6 @@ governing permissions and limitations under the License.
3737
--spectrum-progress-circle-thickness: var(--spectrum-progress-circle-thickness-large);
3838
}
3939

40-
.spectrum-Circle {
41-
fill: none;
42-
}
43-
44-
/* windows high contrast mode */
45-
@media (forced-colors: active) {
46-
.spectrum-ProgressCircle {
47-
/* fill is bright color */
48-
--highcontrast-progress-circle-fill-border-color: Highlight;
49-
}
50-
51-
.spectrum-ProgressCircle:not(.spectrum-ProgressCircle--indeterminate) {
52-
.spectrum-innerCircle {
53-
stroke: CanvasText;
54-
}
55-
56-
.spectrum-outerCircle {
57-
border: 1px solid;
58-
border-color: CanvasText;
59-
border-radius: 50%;
60-
}
61-
}
62-
}
63-
6440
.spectrum-ProgressCircle {
6541
display: inline-block;
6642
inline-size: var(--mod-progress-circle-size, var(--spectrum-progress-circle-size));
@@ -92,7 +68,7 @@ governing permissions and limitations under the License.
9268

9369
.spectrum-ProgressCircle-track {
9470
stroke-width: var(--mod-progress-circle-thickness, var(--spectrum-progress-circle-thickness));
95-
stroke: var(--highcontrast-progressbar-track-color, var(--mod-progress-circle-track-border-color, var(--spectrum-progress-circle-track-border-color)));
71+
stroke: var(--highcontrast-progress-circle-track-color, var(--mod-progress-circle-track-border-color, var(--spectrum-progress-circle-track-border-color)));
9672
}
9773

9874
/* circle progress filled */
@@ -108,8 +84,8 @@ governing permissions and limitations under the License.
10884
.spectrum-ProgressCircle-fill {
10985
will-change: transform;
11086
animation:
111-
1s cubic-bezier(.6, .1, .3, .9) infinite spectrum-fills-rotate,
112-
1s cubic-bezier(.25, .1, .25, 1.3) infinite spectrum-dashoffset-animation;
87+
1s cubic-bezier(0.6, 0.1, 0.3, 0.9) infinite spectrum-fills-rotate,
88+
1s cubic-bezier(0.25, 0.1, 0.25, 1.3) infinite spectrum-dashoffset-animation;
11389
transform-origin: center;
11490
}
11591
}
@@ -119,8 +95,18 @@ governing permissions and limitations under the License.
11995
.spectrum-ProgressCircle {
12096
/* fill is bright color */
12197
--highcontrast-progress-circle-fill-border-color: Highlight;
98+
--highcontrast-progress-circle-track-color: Background;
99+
}
100+
101+
.spectrum-ProgressCircle:not(.spectrum-ProgressCircle--indeterminate) {
102+
.spectrum-innerCircle {
103+
stroke: CanvasText;
104+
}
122105

123-
/* fill over background is bright color */
124-
--highcontrast-progress-circle-fill-border-color-over-background: Highlight;
106+
.spectrum-outerCircle {
107+
border: 1px solid;
108+
border-color: CanvasText;
109+
border-radius: 50%;
110+
}
125111
}
126112
}

components/progresscircle/stories/progresscircle.test.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ export const ProgressCircleGroup = Variants({
1111
testHeading: "Static white",
1212
staticColor: "white",
1313
},
14+
{
15+
testHeading: "Static black",
16+
staticColor: "black",
17+
},
1418
],
1519
stateData: [
1620
{

0 commit comments

Comments
 (0)