Skip to content

Foundation: Remove inadvertently added Object.assign usage #6286

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
JasonGore merged 2 commits into from
Sep 7, 2018
Merged

Foundation: Remove inadvertently added Object.assign usage #6286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34bd596
Remove Object.assign usage inadvertently added by #6268.
JasonGore Sep 7, 2018
eadb2e2
Change file.
JasonGore Sep 7, 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/foundation/jg-remove-object-assign-again_2018-09-07-20-55.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/foundation",
"comment": "Remove Object.assign usage to fix IE11 issues.",
"type": "patch"
}
],
"packageName": "@uifabric/foundation",
"email": "[email protected]"
}
39 changes: 23 additions & 16 deletions packages/foundation/src/createComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,18 @@ export function createComponent<
// TODO: Should 'rest' props from customizations pass onto view? They are not currently.
// (items like theme seem like they shouldn't)
const propStyles = processedProps.styles || userProps.styles;
const themedProps: TProcessedProps = Object.assign({}, rest, userProps, processedProps);
const viewProps: IViewComponentProps<TProcessedProps, TProcessedStyleSet> = Object.assign({}, processedProps, userProps, {
classNames: providers.mergeStyleSets(
_evaluateStyle(themedProps, options.styles),
_evaluateStyle(themedProps, contextStyles),
_evaluateStyle(themedProps, propStyles)
)
});
const styleProps: TProcessedProps = { ...rest, ...(processedProps as any), ...(userProps as any) };
const viewProps: IViewComponentProps<TProcessedProps, TProcessedStyleSet> = {
...(processedProps as any),
...(userProps as any),
...{
classNames: providers.mergeStyleSets(
_evaluateStyle(styleProps, options.styles),
_evaluateStyle(styleProps, contextStyles),
_evaluateStyle(styleProps, propStyles)
)
}
};

// TODO: consider rendering view as JSX component with display name in debug mode to aid in debugging
return options.view(viewProps);
Expand Down Expand Up @@ -204,14 +208,17 @@ export function createStatelessComponent<
// TODO: Should 'rest' props from customizations pass onto view? They are not currently.
// (items like theme seem like they shouldn't)
const { styles: propStyles } = processedProps;
const themedProps: TProcessedProps = Object.assign({}, rest, processedProps);
const viewProps: IViewComponentProps<TProcessedProps, TProcessedStyleSet> = Object.assign({}, processedProps, {
classNames: providers.mergeStyleSets(
_evaluateStyle(themedProps, options.styles),
_evaluateStyle(themedProps, contextStyles),
_evaluateStyle(themedProps, propStyles)
)
});
const styleProps: TProcessedProps = { ...rest, ...(processedProps as any) };
const viewProps: IViewComponentProps<TProcessedProps, TProcessedStyleSet> = {
...(processedProps as any),
...{
classNames: providers.mergeStyleSets(
_evaluateStyle(styleProps, options.styles),
_evaluateStyle(styleProps, contextStyles),
_evaluateStyle(styleProps, propStyles)
)
}
};

// TODO: consider rendering view as JSX component with display name in debug mode to aid in debugging
return options.view(viewProps);
Expand Down