Skip to content

ContextualMenu - Added support for custom component lengths and fixed aria-posinset value #4004

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
jspurlin merged 7 commits into from
Feb 21, 2018
Merged

ContextualMenu - Added support for custom component lengths and fixed aria-posinset value #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ef8956
used correct indexing for focusable element idnex
Feb 16, 2018
8719e95
fixed focus element index
Feb 16, 2018
801acae
add support for custom components to have their own lists
Feb 17, 2018
c3ae4f4
update comment
Feb 17, 2018
6af5611
fixed the indexing to include moving to the next element
Feb 20, 2018
ae0d5bb
reverted, the original change is correct
Feb 20, 2018
12f45d5
resoled build problems
Feb 21, 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/menusize_2018-02-16-18-26.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": "Updated contextual menu to pass the correct number",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "chiechan@microsoft.com"
}
15 changes: 9 additions & 6 deletions packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ export class ContextualMenu extends BaseComponent<IContextualMenuProps, IContext
for (let item of items) {
if (item.itemType !== ContextualMenuItemType.Divider &&
item.itemType !== ContextualMenuItemType.Header) {
totalItemCount++;
const itemCount = item.customOnRenderListLength ? item.customOnRenderListLength : 1;
totalItemCount += itemCount;
}
}
return (
Expand Down Expand Up @@ -313,11 +314,13 @@ export class ContextualMenu extends BaseComponent<IContextualMenuProps, IContext
onKeyDown={ this._onKeyDown }
>
{ items.map((item, index) => {
if (item.itemType === ContextualMenuItemType.Divider ||
item.itemType === ContextualMenuItemType.Header) {
indexCorrection++;
const menuItem = this._renderMenuItem(item, index, indexCorrection, totalItemCount, hasCheckmarks, hasIcons);
if (item.itemType !== ContextualMenuItemType.Divider &&
item.itemType !== ContextualMenuItemType.Header) {
const indexIncrease = item.customOnRenderListLength ? item.customOnRenderListLength : 1;
indexCorrection += indexIncrease;
}
return this._renderMenuItem(item, index, index - indexCorrection, totalItemCount, hasCheckmarks, hasIcons);
return menuItem;
}) }
</ul>
</FocusZone>
Expand Down Expand Up @@ -444,7 +447,7 @@ export class ContextualMenu extends BaseComponent<IContextualMenuProps, IContext

private _renderNormalItem(item: IContextualMenuItem, classNames: IMenuItemClassNames, index: number, focusableElementIndex: number, totalItemCount: number, hasCheckmarks: boolean, hasIcons: boolean): React.ReactNode {
if (item.onRender) {
return [item.onRender({ 'aria-posinset': focusableElementIndex, 'aria-setsize': totalItemCount, ...item }, this.dismiss)];
return [item.onRender({ 'aria-posinset': focusableElementIndex + 1, 'aria-setsize': totalItemCount, ...item }, this.dismiss)];
}
if (item.href) {
return this._renderAnchorMenuItem(item, classNames, index, focusableElementIndex, totalItemCount, hasCheckmarks, hasIcons);
Expand Down
7 changes: 7 additions & 0 deletions packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,13 @@ export interface IContextualMenuItem {
*/
role?: string;

/**
* When rendering a custom component that is passed in, the component might also be a list of
* elements. We want to keep track of the correct index our menu is using based off of
* the length of the custom list. It is up to the user to increment the count for their list.
*/
customOnRenderListLength?: number;

/**
* Any additional properties to use when custom rendering menu items.
*/
Expand Down