Skip to content

Commit

Permalink
(web-components) update neutral fill card (#18432)
Browse files Browse the repository at this point in the history
Updated the neutral fill card color recipe to always be lighter or equal to the container, instead of flipping to go darker over white.
  • Loading branch information
bheston authored Jun 3, 2021
1 parent 2c9b177 commit c474353
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Updated the neutral fill card color recipe to always be lighter or equal to the container, instead of flipping to go darker over white.",
"packageName": "@fluentui/web-components",
"email": "47367562+bheston@users.noreply.github.com",
"dependentChangeType": "patch"
}
6 changes: 3 additions & 3 deletions packages/web-components/src/color/neutral-fill-card.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { neutralFillCard } from "./neutral-fill-card";
describe("neutralFillCard", (): void => {
it("should operate on design system defaults", (): void => {
expect(neutralFillCard({} as DesignSystem)).to.equal(
DesignSystemDefaults.neutralPalette[DesignSystemDefaults.neutralFillCardDelta]
DesignSystemDefaults.neutralPalette[0]
);
});
it("should get darker when the index of the backgroundColor is lower than the offset index", (): void => {
it("should stay white when the index of the backgroundColor is lower than the offset index", (): void => {
for (let i: number = 0; i < DesignSystemDefaults.neutralFillCardDelta; i++) {
expect(
DesignSystemDefaults.neutralPalette.indexOf(
Expand All @@ -18,7 +18,7 @@ describe("neutralFillCard", (): void => {
})
)
)
).to.equal(DesignSystemDefaults.neutralFillCardDelta + i);
).to.equal(0);
}
});
it("should return the color at three steps lower than the background color", (): void => {
Expand Down
2 changes: 1 addition & 1 deletion packages/web-components/src/color/neutral-fill-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { findClosestSwatchIndex, getSwatch } from './palette';
const neutralCardFillAlgorithm: SwatchResolver = (designSystem: DesignSystem): Swatch => {
const offset: number = neutralFillCardDelta(designSystem);
const index: number = findClosestSwatchIndex(neutralPalette, backgroundColor(designSystem))(designSystem);
return getSwatch(index - (index < offset ? offset * -1 : offset), neutralPalette(designSystem));
return getSwatch(index - offset, neutralPalette(designSystem));
};

/**
Expand Down

0 comments on commit c474353

Please sign in to comment.