Skip to content

MessageBar: For single line, put action button before dismiss button #4365

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
lynamemi merged 3 commits into from
Mar 26, 2018
Merged

MessageBar: For single line, put action button before dismiss button #4365

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
bc86a95
Reordered button elements for single line messagebars
lynamemi Mar 26, 2018
b105ce1
New example for single line with dismiss and action buttons
lynamemi Mar 26, 2018
146f012
Added change file
lynamemi Mar 26, 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/messagebar-button-order_2018-03-26-21-19.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": "MessageBar: For single line, put dismiss button after action buttons.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "lynam.emily@gmail.com"
}
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/MessageBar/MessageBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ export class MessageBar extends BaseComponent<IMessageBarProps, IMessageBarState
{ this._getIconSpan() }
{ this._renderInnerText() }
{ this._getExpandSingleLine() }
{ this._getActionsDiv() }
{ this._getDismissSingleLine() }
</div>
{ this._getActionsDiv() }
</div >
);
}
Expand Down
15 changes: 15 additions & 0 deletions ...es/office-ui-fabric-react/src/components/MessageBar/examples/MessageBar.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ export const MessageBarBasicExample = () => (
Success lorem ipsum dolor sit amet. <Link href='www.bing.com'>Visit our website.</Link>
</MessageBar>

<Label>Warning MessageBar - single line, with dismiss and action buttons</Label>
<MessageBar
messageBarType={ MessageBarType.warning }
isMultiline={ false }
onDismiss={ log('test') }
dismissButtonAriaLabel='Close'
actions={
<div>
<MessageBarButton>Action</MessageBarButton>
</div>
}
>
Warning lorem ipsum dolor sit amet, a elit sem interdum consectetur adipiscing elit. <Link href='www.bing.com'>Visit our website.</Link>
</MessageBar>

<Label>Warning MessageBar - defaults to multiline, with dismiss and action buttons</Label>
<MessageBar
onDismiss={ log('test') }
Expand Down