From 9155d3dc7db45bf91765d3e9f2b0d435e9b2d811 Mon Sep 17 00:00:00 2001 From: Eliza Khachatryan Date: Sun, 8 Jan 2023 16:57:36 -0800 Subject: [PATCH] fix(combobox-item): bumping the scale of icon to M when parent accordion is scale L --- src/components/combobox-item/combobox-item.tsx | 3 ++- src/components/combobox/combobox.stories.ts | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/components/combobox-item/combobox-item.tsx b/src/components/combobox-item/combobox-item.tsx index 047984662f6..2f95d6ffcba 100644 --- a/src/components/combobox-item/combobox-item.tsx +++ b/src/components/combobox-item/combobox-item.tsx @@ -86,6 +86,7 @@ export class ComboboxItem implements ConditionalSlotComponent, InteractiveCompon isNested: boolean; + /** Specifies the scale of the combobox-item controlled by parent, defaults to m */ scale: Scale = "m"; // -------------------------------------------------------------------------- @@ -168,7 +169,7 @@ export class ComboboxItem implements ConditionalSlotComponent, InteractiveCompon }} flipRtl={iconFlipRtl} icon={icon || iconPath} - scale="s" + scale={this.scale === "l" ? "m" : "s"} /> ); } diff --git a/src/components/combobox/combobox.stories.ts b/src/components/combobox/combobox.stories.ts index c9c61f36626..9aff6e5adcd 100644 --- a/src/components/combobox/combobox.stories.ts +++ b/src/components/combobox/combobox.stories.ts @@ -414,3 +414,18 @@ export const optionListMinWidthMatchesInputWhenOverlayPositioningIsFixed_TestOnl `; + +export const mediumIconForLargeComoboboxItem_TestOnly = (): string => html` + + + + + + +`;