Skip to content

Fix onitem click for contextual menu with anchor item #5003

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
bcarthic merged 4 commits into from
May 29, 2018
Merged

Fix onitem click for contextual menu with anchor item #5003

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d959997
Fix onitemclick for contextual menu #5002
bcarthic May 26, 2018
da13c6a
Adding change file
bcarthic May 26, 2018
2070744
Replaced with jest mock function
bcarthic May 29, 2018
6c797e1
Overide base class click
bcarthic May 29, 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/office-ui-fabric-react-5002_2018-05-26-00-58.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 passing onclick from props for contextual anchor item",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
3 changes: 3 additions & 0 deletions ...act/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ describe('ContextualMenuButton', () => {
describe('creates a normal button', () => {
let menuItem: IContextualMenuItem;
let menuClassNames: IMenuItemClassNames;
let itemOnClick: jest.Mock;

beforeEach(() => {
menuItem = { key: '123' };
menuClassNames = getMenuItemClassNames();
itemOnClick = jest.fn();
});

it('renders the contextual menu split button correctly', () => {
Expand All @@ -22,6 +24,7 @@ describe('ContextualMenuButton', () => {
index={ 0 }
focusableElementIndex={ 0 }
totalItemCount={ 1 }
onItemClick={ itemOnClick }
Copy link
Contributor

@kelseyyoung kelseyyoung May 29, 2018

Choose a reason for hiding this comment

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

Why do you need to set this in the test if it's not going to be used?

Copy link
Collaborator Author

@bcarthic bcarthic May 29, 2018

Choose a reason for hiding this comment

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

Because the snapshot has it has a function, The actual behavior should be if we have onclick then we should invoke otherwise we shouldnt have any default method.

/>);
const tree = component.toJSON();
expect(tree).toMatchSnapshot();
Expand Down
2 changes: 1 addition & 1 deletion ...ic-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class ContextualMenuAnchor extends ContextualMenuItemWrapper {
aria-setsize={ totalItemCount }
aria-disabled={ isItemDisabled(item) }
style={ item.style }
onClick={ this._onItemClick }
onClick={ onItemClick ? onItemClick.bind(this, item) : undefined }
Copy link
Contributor

@joschect joschect May 29, 2018

Choose a reason for hiding this comment

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

I don't believe that this is the correct place to make this change. The issue is that ContextualMenuAnchor doesn't get an onItemBaseClick passed to it, so the onClick is never called in this._onItemClick. I believe the correct response is change contextualmenuitemwrapper's this._onItemClick to the following.

protected _onItemClick = (ev: React.MouseEvent<HTMLElement>): void => {
    const { item, onItemClickBase, onItemClick } = this.props;
    if (onItemClickBase) {
      onItemClickBase(item, ev, ev.currentTarget as HTMLElement);
    } else if (onItemClick) {
      onItemClick(item, ev);
    }
}

Copy link
Collaborator Author

@bcarthic bcarthic May 29, 2018

Choose a reason for hiding this comment

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

Since we dont pass onItemClickBase to ContextualMenuAnchor, it is best override the onItemClick here as per our suggestion

onMouseEnter={ this._onItemMouseEnter }
onMouseLeave={ this._onItemMouseLeave }
onKeyDown={ itemHasSubmenu ? this._onItemKeyDown : null }
Expand Down
10 changes: 10 additions & 0 deletions ...e-ui-fabric-react/src/components/ContextualMenu/examples/ContextualMenu.Basic.Example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ export class ContextualMenuBasicExample extends React.Component {
href: 'http://bing.com',
target: '_blank'
},
{
key: 'linkWithOnClick',
name: 'Link click',
href: 'http://bing.com',
onClick: (ev: React.MouseEvent<HTMLAnchorElement | HTMLButtonElement>) => {
alert('Link clicked');
ev.preventDefault();
},
target: '_blank'
},
{
key: 'disabled',
name: 'Disabled item',
Expand Down