From a4e12d6ea2ec401561f769c6b26229853632f6b3 Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Fri, 2 Feb 2018 16:23:16 -0800
Subject: [PATCH 1/7] added new aria types for contextual menu

---
 .../src/components/ContextualMenu/ContextualMenu.tsx   |  2 ++
 .../components/ContextualMenu/ContextualMenu.types.ts  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index 2ab90b4c2c58c2..5bc775bc9b4871 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -442,6 +442,8 @@ 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) {
+      item.positionInSet = focusableElementIndex;
+      item.setSize = totalItemCount;
       return [item.onRender(item, this.dismiss)];
     }
     if (item.href) {
diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
index 5f1eb27174d5eb..1a2b950af0e371 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
@@ -406,6 +406,16 @@ export interface IContextualMenuItem {
    */
   role?: string;
 
+  /**
+   * Optional accessibility a list item's position in the list (aria-posinset) attribute that will be stamped on to the element.
+   */
+  positionInSet?: number;
+
+  /**
+   * Optional accessibility for total size of a list (aria-setsize) attribute that will be stamped on to the element.
+   */
+  setSize?: number;
+
   /**
    * Any additional properties to use when custom rendering menu items.
    */

From eb6db7e02f5e331e13b9fd3229bd0f6fef969a48 Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Fri, 2 Feb 2018 16:25:39 -0800
Subject: [PATCH 2/7] add change files

---
 .../accContextualMenu_2018-02-03-00-25.json           | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/office-ui-fabric-react/accContextualMenu_2018-02-03-00-25.json

diff --git a/common/changes/office-ui-fabric-react/accContextualMenu_2018-02-03-00-25.json b/common/changes/office-ui-fabric-react/accContextualMenu_2018-02-03-00-25.json
new file mode 100644
index 00000000000000..5def6f81b68fdc
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/accContextualMenu_2018-02-03-00-25.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Contextual Menu - adding support for aria-setsize and aria-posinset for rendering menu items that relies on the menu item's own rendering",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "chiechan@microsoft.com"
+}
\ No newline at end of file

From b9c1e848328f524557686b8ff306ae6e73c8f90e Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Fri, 2 Feb 2018 16:58:12 -0800
Subject: [PATCH 3/7] added other passed in values

---
 .../src/components/ContextualMenu/ContextualMenu.tsx   |  2 ++
 .../components/ContextualMenu/ContextualMenu.types.ts  | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index 5bc775bc9b4871..0c3f284e28408f 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -444,6 +444,8 @@ export class ContextualMenu extends BaseComponent<IContextualMenuProps, IContext
     if (item.onRender) {
       item.positionInSet = focusableElementIndex;
       item.setSize = totalItemCount;
+      item.hasCheckMarks = hasCheckmarks;
+      item.hasIcon = hasIcons;
       return [item.onRender(item, this.dismiss)];
     }
     if (item.href) {
diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
index 1a2b950af0e371..66bfd5f49359da 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
@@ -416,6 +416,16 @@ export interface IContextualMenuItem {
    */
   setSize?: number;
 
+  /**
+   * True if a list of menu items can contain a checkbox. False/undefined otherwise.
+   */
+  hasCheckMark?: boolean;
+
+  /**
+   * True if a menu items can contain a icon. False/undefined otherwise.
+   */
+  hasIcons?: boolean;
+
   /**
    * Any additional properties to use when custom rendering menu items.
    */

From 1085576c30a96a95fd23de59f684d797ef3bcd65 Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Thu, 8 Feb 2018 14:24:13 -0800
Subject: [PATCH 4/7] added all selector

---
 .../src/components/ContextualMenu/ContextualMenu.tsx        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index 0c3f284e28408f..e4318d1ad9421a 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -442,11 +442,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) {
-      item.positionInSet = focusableElementIndex;
-      item.setSize = totalItemCount;
-      item.hasCheckMarks = hasCheckmarks;
-      item.hasIcon = hasIcons;
-      return [item.onRender(item, this.dismiss)];
+      return [item.onRender({ posInSet: focusableElementIndex, setSize: totalItemCount, ...item }, this.dismiss)];
     }
     if (item.href) {
       return this._renderAnchorMenuItem(item, classNames, index, focusableElementIndex, totalItemCount, hasCheckmarks, hasIcons);

From c7da45a2deadb897b699b8aba1fe076043553eda Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Thu, 8 Feb 2018 15:24:03 -0800
Subject: [PATCH 5/7] used all prop selector; changes comments

---
 .../components/ContextualMenu/ContextualMenu.tsx   |  2 +-
 .../ContextualMenu/ContextualMenu.types.ts         | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index e4318d1ad9421a..6057318fa495cf 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -442,7 +442,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({ posInSet: focusableElementIndex, setSize: totalItemCount, ...item }, this.dismiss)];
+      return [item.onRender({ positionInSet: focusableElementIndex, setSize: totalItemCount, ...item }, this.dismiss)];
     }
     if (item.href) {
       return this._renderAnchorMenuItem(item, classNames, index, focusableElementIndex, totalItemCount, hasCheckmarks, hasIcons);
diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
index 66bfd5f49359da..c884e6be42bd5e 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
@@ -407,25 +407,15 @@ export interface IContextualMenuItem {
   role?: string;
 
   /**
-   * Optional accessibility a list item's position in the list (aria-posinset) attribute that will be stamped on to the element.
+   * (Optional) Accessible value of a list item's position in the list (aria-posinset) attribute that will be stamped on to the element.
    */
   positionInSet?: number;
 
   /**
-   * Optional accessibility for total size of a list (aria-setsize) attribute that will be stamped on to the element.
+   * (Optional) Accessible value for total size of a list (aria-setsize) that will be stamped on to the element.
    */
   setSize?: number;
 
-  /**
-   * True if a list of menu items can contain a checkbox. False/undefined otherwise.
-   */
-  hasCheckMark?: boolean;
-
-  /**
-   * True if a menu items can contain a icon. False/undefined otherwise.
-   */
-  hasIcons?: boolean;
-
   /**
    * Any additional properties to use when custom rendering menu items.
    */

From 2c5e4d5341a4cd18ff8c637c880d620b0d60fa22 Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Thu, 8 Feb 2018 15:31:28 -0800
Subject: [PATCH 6/7] removed reference to new posinset and setsize props

---
 .../src/components/ContextualMenu/ContextualMenu.tsx   |  2 +-
 .../components/ContextualMenu/ContextualMenu.types.ts  | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index 6057318fa495cf..3bf8ee343bae21 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -442,7 +442,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({ positionInSet: focusableElementIndex, setSize: totalItemCount, ...item }, this.dismiss)];
+      return [item.onRender({ 'aria-posinset': focusableElementIndex, ['aria-setsize']: totalItemCount, ...item }, this.dismiss)];
     }
     if (item.href) {
       return this._renderAnchorMenuItem(item, classNames, index, focusableElementIndex, totalItemCount, hasCheckmarks, hasIcons);
diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
index c884e6be42bd5e..5f1eb27174d5eb 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.types.ts
@@ -406,16 +406,6 @@ export interface IContextualMenuItem {
    */
   role?: string;
 
-  /**
-   * (Optional) Accessible value of a list item's position in the list (aria-posinset) attribute that will be stamped on to the element.
-   */
-  positionInSet?: number;
-
-  /**
-   * (Optional) Accessible value for total size of a list (aria-setsize) that will be stamped on to the element.
-   */
-  setSize?: number;
-
   /**
    * Any additional properties to use when custom rendering menu items.
    */

From e9a8719b080a9215527af82c966c6b0daf3a0cc5 Mon Sep 17 00:00:00 2001
From: "REDMOND\\chiechan" <chiechan@microsoft.com>
Date: Thu, 8 Feb 2018 17:13:47 -0800
Subject: [PATCH 7/7] removed aray of aria set size for contextual menu

---
 .../src/components/ContextualMenu/ContextualMenu.tsx            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
index 3bf8ee343bae21..5a1916e8febf31 100644
--- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
+++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenu.tsx
@@ -442,7 +442,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, 'aria-setsize': totalItemCount, ...item }, this.dismiss)];
     }
     if (item.href) {
       return this._renderAnchorMenuItem(item, classNames, index, focusableElementIndex, totalItemCount, hasCheckmarks, hasIcons);