Skip to content

ContextualMenuSample: Use DefaultButton instead of html button #4194

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
jordandrako merged 2 commits into from
Mar 6, 2018
Merged

ContextualMenuSample: Use DefaultButton instead of html button #4194

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
f7a7bb4
Use DefaultButton instead of html button
Mar 6, 2018
238bcbc
npm run change output
Mar 6, 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 ...changes/@uifabric/example-app-base/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/example-app-base",
"type": "none"
}
],
"packageName": "@uifabric/example-app-base",
"email": "v-jojanz@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/experiments/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/experiments",
"type": "none"
}
],
"packageName": "@uifabric/experiments",
"email": "v-jojanz@microsoft.com"
}
11 changes: 11 additions & 0 deletions ...n/changes/@uifabric/fabric-website/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/fabric-website",
"type": "none"
}
],
"packageName": "@uifabric/fabric-website",
"email": "v-jojanz@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/styling/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/styling",
"type": "none"
}
],
"packageName": "@uifabric/styling",
"email": "v-jojanz@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/@uifabric/utilities/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"packageName": "@uifabric/utilities",
"type": "none"
}
],
"packageName": "@uifabric/utilities",
"email": "v-jojanz@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/hotfix-ContextMenu-sample-styles_2018-03-06-19-11.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": "Fix ContextualMenu customization sample",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "v-jojanz@microsoft.com"
}
4 changes: 2 additions & 2 deletions ...ric-react/src/components/ContextualMenu/examples/ContextualMenu.Customization.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export class ContextualMenuCustomizationExample extends React.Component<{}, {}>
<ul className='ms-ContextualMenu-customizationExample-categoriesList'>
<li className='ms-ContextualMenu-item'>
{ item.categoryList.map((category: any) =>
<button className='ms-ContextualMenu-link' role='menuitem' key={ category.name }>
<DefaultButton className='ms-ContextualMenu-link ms-ContextualMenu-customizationExample-button' role='menuitem' key={ category.name }>
<div>
<span
className='ms-ContextualMenu-icon ms-ContextualMenu-customizationExample-categorySwatch'
Expand All @@ -214,7 +214,7 @@ export class ContextualMenuCustomizationExample extends React.Component<{}, {}>
{ category.name }
</span>
</div>
</button>
</DefaultButton>
) }
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions ...src/components/ContextualMenu/examples/ContextualMenu.CustomizationWithNoWrap.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ export class ContextualMenuCustomizationWithNoWrapExample extends React.Componen
<ul className='ms-ContextualMenu-customizationExample-categoriesList'>
<li className='ms-ContextualMenu-item'>
{ item.categoryList.map((category: any) =>
<button key={ category.name } className='ms-ContextualMenu-link' role='menuitem'>
<DefaultButton key={ category.name } className='ms-ContextualMenu-link ms-ContextualMenu-customizationExample-button' role='menuitem'>
<div>
<span
className='ms-ContextualMenu-icon ms-ContextualMenu-customizationExample-categorySwatch'
Expand All @@ -225,7 +225,7 @@ export class ContextualMenuCustomizationWithNoWrapExample extends React.Componen
{ category.name }
</span>
</div>
</button>
</DefaultButton>
) }
</li>
</ul>
Expand Down
5 changes: 4 additions & 1 deletion .../office-ui-fabric-react/src/components/ContextualMenu/examples/ContextualMenuExample.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
}

.ms-ContextualMenu-customizationExample-categorySwatch {
margin: 6px 8px;
width: 24px;
height: 24px;
vertical-align: top;
Expand All @@ -68,4 +67,8 @@
height: auto;
}
}

.ms-ContextualMenu-customizationExample-button {
max-width: 50%;
}
}