fix: ts

launchdarkly · Sep 24, 2024 · 90f0913 · 90f0913
1 parent 5c4348d
commit 90f0913
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/angry-pears-return.md b/.changeset/angry-pears-return.md
@@ -1,6 +1,8 @@
 ---
 "@launchpad-ui/icons": minor
+"@launchpad-ui/avatar": patch
 "@launchpad-ui/chip": patch
+"@launchpad-ui/filter": patch
 "@launchpad-ui/core": patch
 ---
 
@@ -9,3 +11,4 @@ Align API with RAC components:
   - Remove outer `span`
   - Prop `subtle` -> `variant`
   - Prop `children` for custom icons
+  - Consolidate sizes
diff --git a/packages/avatar/src/Avatar.tsx b/packages/avatar/src/Avatar.tsx
@@ -80,8 +80,9 @@ const Avatar = ({
 		}
 		return cloneElement(defaultIcon, {
 			className: classes,
+			// @ts-expect-error pass through
 			'data-test-id': testId,
-			size,
+			...(size !== 'tiny' && { size }),
 			...(rest as IconProps),
 		});
 	}

diff --git a/packages/filter/src/FilterButton.tsx b/packages/filter/src/FilterButton.tsx
@@ -92,7 +92,7 @@ const FilterButton = forwardRef<Ref, FilterButtonProps>((props, ref) => {
 						aria-label={ariaLabel}
 						className={styles.clear}
 						data-test-id="clear-filter-button"
-						icon={<Icon name="cancel" size="tiny" />}
+						icon={<Icon name="cancel" size="small" />}
 						size="small"
 						onClick={onClear}
 					/>

diff --git a/packages/icons/src/Icon.tsx b/packages/icons/src/Icon.tsx
@@ -63,7 +63,8 @@ const Icon = ({
 		>
 			{title && <title id={titleId}>{title}</title>}
 			{description && <desc id={descriptionId}>{description}</desc>}
-			{children || <use href={`#lp-icon-${name}`} />}
+			{name && <use href={`#lp-icon-${name}`} />}
+			{children}
 		</svg>
 	);
 };

diff --git a/packages/tag/stories/Tag.stories.tsx b/packages/tag/stories/Tag.stories.tsx
@@ -206,7 +206,7 @@ export const WithCustomTagContent: Story = {
 			<TagGroup items={MOCK_TAGS}>
 				{(item) => (
 					<TagItem>
-						<Icon name="star" size="tiny" style={{ transform: 'translateY(-1px)' }} /> {item.name}
+						<Icon name="star" size="small" style={{ transform: 'translateY(-1px)' }} /> {item.name}
 					</TagItem>
 				)}
 			</TagGroup>