Skip to content

fix(progress-circle): ensure size can be applied to non-"size" attribute bearing elements #4055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2024
Merged

fix(progress-circle): ensure size can be applied to non-"size" attribute bearing elements #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
302933e
fix(progress-circle): ensure size can be applied to non-"size" attrib…
Westbrook Feb 20, 2024
aa726a2
ci: update golden images cache
Westbrook Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
parameters:
current_golden_images_hash:
type: string
default: c3df2b2da5c455e279b0a4396c2b15ee164dd246
default: d722636bd94d3bb522dd578cfb7dc9403e093e98
wireit_cache_name:
type: string
default: wireit
Expand Down
44 changes: 15 additions & 29 deletions packages/button/stories/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,35 +116,21 @@ export const makeOverBackground =
};

export function renderButton(properties: Properties): TemplateResult {
if (properties.variant) {
return html`
<sp-button
variant="${properties.variant}"
treatment="${properties.treatment}"
?quiet="${!!properties.quiet}"
?disabled=${!!properties.disabled}
size=${properties.size || 'm'}
href=${ifDefined(properties.href)}
target=${ifDefined(properties.target)}
?warning=${properties.warning}
?pending=${!!properties.pending}
?icon-only=${properties.iconOnly}
>
${properties.content || 'Click Me'}
</sp-button>
`;
} else {
return html`
<sp-button
?quiet="${!!properties.quiet}"
?disabled=${!!properties.disabled}
size=${properties.size}
?pending=${!!properties.pending}
>
${properties.content || 'Click Me'}
</sp-button>
`;
}
return html`
<sp-button
?disabled=${!!properties.disabled}
href=${ifDefined(properties.href)}
?icon-only=${properties.iconOnly}
?pending=${!!properties.pending}
?quiet="${!!properties.quiet}"
size=${properties.size}
target=${ifDefined(properties.target)}
treatment=${ifDefined(properties.treatment)}
variant=${ifDefined(properties.variant)}
>
${properties.content || 'Click Me'}
</sp-button>
`;
}

export function renderButtonSet(properties: Properties): TemplateResult {
Expand Down
1 change: 0 additions & 1 deletion packages/button/stories/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export interface Properties {
size?: 's' | 'm' | 'l' | 'xl';
href?: string;
target?: '_blank' | '_parent' | '_self' | '_top';
warning?: boolean;
iconOnly?: boolean;
}

Expand Down
9 changes: 9 additions & 0 deletions packages/progress-circle/src/progress-circle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ governing permissions and limitations under the License.
var(--_spectrum-progress-circle-size)
);

--spectrum-progress-circle-size: inherit;
--spectrum-progresscircle-m-over-background-track-fill-color: var(
--spectrum-alias-track-fill-color-overbackground
);
Expand Down Expand Up @@ -78,3 +79,11 @@ slot {
var(--_spectrum-progress-circle-size)
);
}

/* stylelint-disable */
:host([indeterminate]) .fills,
:host([indeterminate]) .fillSubMask1,
:host([indeterminate]) .fillSubMask2 {
animation-duration: var(--spectrum-animation-duration-2000);
}
/* stylelint-enable */
1 change: 1 addition & 0 deletions projects/story-decorator/src/StoryDecorator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const reduceMotionProperties = css`
--spectrum-animation-duration-2000: 0ms;
--spectrum-animation-duration-4000: 0ms;
--spectrum-animation-duration-6000: 0ms;
--pending-delay: 0s;
--spectrum-coachmark-animation-indicator-ring-duration: 0ms;
--swc-test-duration: 1ms;
`;
Expand Down