feat(progresscircle): fixing animation stuff

Author: aramos-adobe

components/button/stories/template.js

@@ -33,7 +33,6 @@ export const Template = ({
 	isPending = false,
 	ariaExpanded,
 	ariaControls,
-<<<<<<< HEAD
 	noWrap = false,
 } = {}, context = {}) => {
 	const { updateArgs } = context;
@@ -102,58 +101,6 @@ export const Template = ({
 		)}
 	</button>
 	`;
-=======
-	...globals
-}) => {
-	const [, updateArgs] = useArgs();
-
-	return html`
-    <button
-      class=${classMap({
-        [rootClass]: true,
-        [`${rootClass}--${treatment}`]: typeof treatment !== "undefined" && treatment !== "fill",
-        [`${rootClass}--${variant}`]: typeof variant !== "undefined",
-        [`${rootClass}--size${size?.toUpperCase()}`]: typeof size !== "undefined" && size !== "m",
-        [`${rootClass}--static${capitalize(lowerCase(staticColor))}`]: typeof staticColor !== "undefined",
-        [`${rootClass}--iconOnly`]: hideLabel,
-        ["is-pending"]: isPending,
-        ["is-disabled"]: isDisabled,
-				["is-hover"]: isHovered,
-				["is-focus-visible"]: isFocused,
-				["is-active"]: isActive,
-        ...customClasses.reduce((a, c) => ({ ...a, [c]: true }), {}),
-      })}
-      id=${ifDefined(id)}
-      style=${ifDefined(styleMap(customStyles))}
-      ?disabled=${isDisabled}
-      @click=${onclick ?? function() {
-        // Toggle the is-pending state on-click
-        updateArgs({ isPending: true });
-        setTimeout(() => {
-          updateArgs({ isPending: false });
-        }, 3000);
-      }}
-      aria-label=${ifDefined(hideLabel ? iconName : undefined)}
-      aria-expanded=${ifDefined(ariaExpanded?.toString())}
-      aria-controls=${ifDefined(ariaControls)}
-      data-testid=${ifDefined(testId)}
-    >
-      ${when(iconName && !iconAfterLabel, () => Icon({ ...globals, iconName, size }))}
-      ${when(label && !hideLabel,
-        () => html`<span class=${`${rootClass}-label`}>${label}</span>`
-      )}
-      ${when(iconName && iconAfterLabel, () => Icon({ ...globals, iconName, size }))}
-      ${when(isPending, () => ProgressCircle({
-        ...globals,
-        size: "s",
-        testId: "progress-circle",
-        staticColor,
-        isIndeterminate: true,
-        isInField: true
-      }))}
-    </button>
-  `;
->>>>>>> eb466e45f (feat(button): migrate to Spectrum 2 (#2600))
 };
 
 /**

components/progresscircle/stories/progresscircle.stories.js

@@ -22,7 +22,6 @@ export default {
 			table: {
 				type: { summary: "string" },
 				category: "Advanced",
-
 			},
 			options: ["white", "black"],
 			control: "select",