Skip to content

Variants: fix theming output so original input theme values are respected #4393

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

Merged
phkuo merged 4 commits into from
Mar 29, 2018
Merged

Variants: fix theming output so original input theme values are respected #4393

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
702fcea
oops
phkuo Mar 28, 2018
4930d5d
changefile
phkuo Mar 28, 2018
341bd88
dry
phkuo Mar 28, 2018
bd870c7
max line length error
phkuo Mar 28, 2018
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
11 changes: 11 additions & 0 deletions common/changes/@uifabric/variants/phkuo-fixMerging_2018-03-28-23-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/variants",
"comment": "fix theme output from variants",
"type": "patch"
}
],
"packageName": "@uifabric/variants",
"email": "[email protected]"
}
24 changes: 21 additions & 3 deletions packages/variants/src/variants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,13 @@ export function getNeutralVariant(theme: IPartialTheme): ITheme {
bodyBackground: p.neutralLighter
};

return createTheme({ ...theme, ...{ palette: partialPalette, semanticColors: partialSemantic } });
return createTheme({
...theme,
...{
palette: { ...theme.palette, ...partialPalette },
semanticColors: { ...theme.semanticColors, ...partialSemantic }
}
});
}

/* Variants
Expand Down Expand Up @@ -121,7 +127,13 @@ export function getSoftVariant(theme: IPartialTheme): ITheme {
// inputFocusBorderAlt: p.themePrimary,
};

return createTheme({ ...theme, ...{ palette: partialPalette, semanticColors: partialSemantic } });
return createTheme({
Copy link
Member

@dzearing dzearing Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...

Copy link
Member

@dzearing dzearing Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems we have the same code multiple times.

Copy link
Member

@dzearing dzearing Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DRY?

...theme,
...{
palette: { ...theme.palette, ...partialPalette },
semanticColors: { ...theme.semanticColors, ...partialSemantic }
}
});
}

/**
Expand Down Expand Up @@ -186,5 +198,11 @@ export function getStrongVariant(theme: IPartialTheme): ITheme {
// inputFocusBorderAlt: p.themePrimary,
};

return createTheme({ ...theme, ...{ palette: partialPalette, semanticColors: partialSemantic } });
return createTheme({
...theme,
...{
palette: { ...theme.palette, ...partialPalette },
semanticColors: { ...theme.semanticColors, ...partialSemantic }
}
});
}