Skip to content

Pivot override styles #4444

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
dzearing merged 12 commits into from
May 14, 2018
Merged

Pivot override styles #4444

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3146f12
pass through className
natalieethell Apr 2, 2018
ad6eb10
Merge branch 'master' into pivotOverrideStyles
natalieethell Apr 3, 2018
adeb1c8
pass className through to CommandButton as well
natalieethell Apr 3, 2018
f442d39
change request file
natalieethell Apr 3, 2018
c87aac2
use getNativeProps
natalieethell Apr 16, 2018
737efb7
merge with master
natalieethell Apr 30, 2018
95eb87b
get rid of unnecessary newline
natalieethell May 1, 2018
e42eecc
added Pivot snapshot test for custom className
natalieethell May 4, 2018
346e7f4
remove space
natalieethell May 8, 2018
31363a4
Merge branch 'master' into pivotOverrideStyles
May 12, 2018
668061b
Update snapshots due to merge of #4728.
May 12, 2018
aeaa67f
Update pivotOverrideStyles_2018-04-03-18-42.json
dzearing May 14, 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/office-ui-fabric-react/pivotOverrideStyles_2018-04-03-18-42.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Pivot: include className in props to override styles",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "naethell@microsoft.com"
}
6 changes: 5 additions & 1 deletion packages/office-ui-fabric-react/src/components/Pivot/Pivot.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {
KeyCodes,
css,
getId,
getNativeProps,
divProperties,
createRef
} from '../../Utilities';
import { CommandButton } from '../../Button';
Expand Down Expand Up @@ -101,8 +103,10 @@ export class PivotBase extends BaseComponent<IPivotProps, IPivotState> {
}

public render(): JSX.Element {
const divProps = getNativeProps(this.props, divProperties);

return (
<div>
<div { ...divProps } >

@dzearing dzearing May 4, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit, space at end.

Also update tests :)

{ this._renderPivotLinks() }
{ this._renderPivotItem() }
</div>
Expand Down