Skip to content
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.

Sign up for GitHub

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

(web-components) update neutral fill card #18432

Merged
merged 3 commits into from
Jun 3, 2021
+11 −4
Merged

(web-components) update neutral fill card #18432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c234ce
Updated the neutral fill card color recipe to always be lighter or eq…
bheston Jun 2, 2021
751d9ef
Change files
bheston Jun 2, 2021
2935c08
Updated tests
bheston Jun 3, 2021
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
7 changes: 7 additions & 0 deletions change/@fluentui-web-components-d6611ae4-5fa9-4379-890a-1de594a175aa.json
View file
Open in desktop
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": "[email protected]",
"dependentChangeType": "patch"
}
6 changes: 3 additions & 3 deletions packages/web-components/src/color/neutral-fill-card.spec.ts
View file
Open in desktop
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
View file
Open in desktop
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