Skip to content

fix(accordion-item): bumping the scale of icon to M when parent accordion is scale L #6252

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions src/components/accordion-item/accordion-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import {
} from "../../utils/conditionalSlot";
import { getElementDir, getElementProp, getSlotted, toAriaBoolean } from "../../utils/dom";
import { CSS_UTILITY } from "../../utils/resources";
import { FlipContext, Position } from "../interfaces";
import { SLOTS, CSS } from "./resources";
import { FlipContext, Position, Scale } from "../interfaces";
import { RegistryEntry, RequestedItem } from "./interfaces";
import { CSS, SLOTS } from "./resources";

/**
* @slot - A slot for adding custom content, including nested `calcite-accordion-item`s.
Expand Down Expand Up @@ -93,6 +93,7 @@ export class AccordionItem implements ConditionalSlotComponent {
this.selectionMode = getElementProp(this.el, "selection-mode", "multiple");
this.iconType = getElementProp(this.el, "icon-type", "chevron");
this.iconPosition = getElementProp(this.el, "icon-position", this.iconPosition);
this.scale = getElementProp(this.el, "scale", this.scale);

connectConditionalSlotComponent(this);
}
Expand Down Expand Up @@ -142,7 +143,7 @@ export class AccordionItem implements ConditionalSlotComponent {
flipRtl={iconFlipRtl === "both" || iconFlipRtl === "start"}
icon={this.iconStart}
key="icon-start"
scale="s"
scale={this.scale === "l" ? "m" : "s"}
/>
) : null;
const iconEndEl = this.iconEnd ? (
Expand All @@ -151,7 +152,7 @@ export class AccordionItem implements ConditionalSlotComponent {
flipRtl={iconFlipRtl === "both" || iconFlipRtl === "end"}
icon={this.iconEnd}
key="icon-end"
scale="s"
scale={this.scale === "l" ? "m" : "s"}
/>
) : null;
const { description } = this;
Expand Down Expand Up @@ -191,7 +192,7 @@ export class AccordionItem implements ConditionalSlotComponent {
? "minus"
: "plus"
}
scale="s"
scale={this.scale === "l" ? "m" : "s"}
/>
</div>
{this.renderActionsEnd()}
Expand Down Expand Up @@ -260,6 +261,10 @@ export class AccordionItem implements ConditionalSlotComponent {

/** handle clicks on item header */
private itemHeaderClickHandler = (): void => this.emitRequestedItem();

/** Specifies the scale of the `accordion-item` controlled by the parent, defaults to m */
scale: Scale = "m";

//--------------------------------------------------------------------------
//
// Private Methods
Expand Down
26 changes: 26 additions & 0 deletions src/components/accordion/accordion.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,29 @@ export const withIconStartAndEnd_TestOnly = (): string =>
)}
`
);

export const mediumIconForLargeAccordionItem_TestOnly = (): string => html`
<calcite-accordion scale="l" style="width: 400px">
<calcite-accordion-item heading="Accordion Item" scale="l"></calcite-accordion-item>
<calcite-accordion-item
heading="Accordion Item IconStart/End"
icon-start="plane"
icon-end="plane"
scale="l"
></calcite-accordion-item>
<calcite-accordion-item heading="Accordion Item" scale="l" description="A great subtitle"></calcite-accordion-item>
<calcite-accordion-item
heading="Accordion Item IconStart/End"
icon-start="plane"
icon-end="plane"
scale="l"
description="A great subtitle"
></calcite-accordion-item>
<calcite-accordion-item
heading="Accordion Item IconStart/End with a potentially two line title"
icon-start="banana"
icon-end="banana"
scale="l"
></calcite-accordion-item>
</calcite-accordion>
`;