From 0dd4a1e8a49865ea94757cfaedd2a220fb70b001 Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Fri, 29 May 2020 10:03:26 -0700
Subject: [PATCH 01/13] Port #7517 & #7796 to add optional aria role property
 to allow override the default aria role in office-ui-fabric-react/5.79.1
 (#13372)

* Add role property into Document and this fix was ported from #7517 & #7796

* add change log

Co-authored-by: Elizabeth Craig <elcraig@microsoft.com>
---
 ...ffice-ui-fabric-react-5.79.1_2020-05-28-08-57.json | 11 +++++++++++
 .../src/components/DocumentCard/DocumentCard.tsx      |  2 +-
 .../src/components/DocumentCard/DocumentCard.types.ts |  7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_4-office-ui-fabric-react-5.79.1_2020-05-28-08-57.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_4-office-ui-fabric-react-5.79.1_2020-05-28-08-57.json b/common/changes/office-ui-fabric-react/hotfix_4-office-ui-fabric-react-5.79.1_2020-05-28-08-57.json
new file mode 100644
index 0000000000000..e4b38862f1c79
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_4-office-ui-fabric-react-5.79.1_2020-05-28-08-57.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "DocumentCard: add optional aria role property to allow override the default aria role.",
+      "type": "minor"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.tsx b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.tsx
index 045fb0fd3a660..fb5eeee3f6904 100644
--- a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.tsx
+++ b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.tsx
@@ -34,7 +34,7 @@ export class DocumentCard extends BaseComponent<IDocumentCardProps, any> {
     }
 
     // if this element is actionable it should have an aria role
-    const role = actionable ? (onClick ? 'button' : 'link') : undefined;
+    const role = this.props.role || (actionable ? (onClick ? 'button' : 'link') : undefined);
     const tabIndex = actionable ? 0 : undefined;
 
     return (
diff --git a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.types.ts b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.types.ts
index e4bf525b74408..569ca62fb63e6 100644
--- a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.types.ts
+++ b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCard.types.ts
@@ -45,6 +45,13 @@ export interface IDocumentCardProps extends React.Props<DocumentCard> {
    */
   className?: string;
 
+  /**
+   * Aria role assigned to the documentCard (Eg. button, link).
+   * Use this to override the default assignment.
+   * @defaultvalue When `onClick` is provided, default role will be 'button'. When `onClickHref` is provided, default role will be 'link'.
+   */
+  role?: string;
+
   /**
    * Hex color value of the line below the card, which should correspond to the document type.
    * This should only be supplied when using the 'compact' card layout.

From f2991d544a034e266af2d91ff2e98da36fea1b2e Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Mon, 22 Jun 2020 12:41:26 -0700
Subject: [PATCH 02/13] Port #7172 to ensure nav links are announced once in
 office-ui-fabric-react/5.79.1 (#13658)

---
 ...ffice-ui-fabric-react-5.79.1_2020-06-18-03-07.json | 11 +++++++++++
 .../src/components/Nav/Nav.base.tsx                   |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_6-office-ui-fabric-react-5.79.1_2020-06-18-03-07.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_6-office-ui-fabric-react-5.79.1_2020-06-18-03-07.json b/common/changes/office-ui-fabric-react/hotfix_6-office-ui-fabric-react-5.79.1_2020-06-18-03-07.json
new file mode 100644
index 0000000000000..6954bdee7cbf9
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_6-office-ui-fabric-react-5.79.1_2020-06-18-03-07.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Ensures nav links are announced once",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx b/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx
index b0742dcd4add1..0873ba1dc42fa 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx
+++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.base.tsx
@@ -163,7 +163,6 @@ export class NavBase extends BaseComponent<INavProps, INavState> implements INav
         styles={ buttonStyles }
         href={ link.url || (link.forceAnchor ? 'javascript:' : undefined) }
         iconProps={ link.iconProps || { iconName: link.icon || '' } }
-        ariaDescription={ link.title || link.name }
         onClick={ link.onClick ? this._onNavButtonLinkClicked.bind(this, link) : this._onNavAnchorLinkClicked.bind(this, link) }
         title={ link.title || link.name }
         target={ link.target }

From dbafcd487a5e1e9c298bc9284d322eb7531e186c Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Mon, 22 Jun 2020 17:53:06 -0700
Subject: [PATCH 03/13] Port #10020 to remove role=presentation in FocusZone in
 office-ui-fabric-react/5.79.1 (#13659)

---
 ...ffice-ui-fabric-react-5.79.1_2020-06-18-06-33.json | 11 +++++++++++
 .../Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap |  3 ---
 .../Calendar/__snapshots__/Calendar.test.tsx.snap     |  2 --
 .../__snapshots__/DetailsList.test.tsx.snap           |  1 -
 .../src/components/FocusZone/FocusZone.tsx            |  1 -
 .../components/Nav/__snapshots__/Nav.test.tsx.snap    |  1 -
 .../Pivot/__snapshots__/Pivot.test.tsx.snap           |  1 -
 .../Rating/__snapshots__/Rating.test.tsx.snap         |  1 -
 .../__snapshots__/SwatchColorPicker.test.tsx.snap     |  1 -
 .../pickers/__snapshots__/BasePicker.test.tsx.snap    |  2 --
 10 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_7-office-ui-fabric-react-5.79.1_2020-06-18-06-33.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_7-office-ui-fabric-react-5.79.1_2020-06-18-06-33.json b/common/changes/office-ui-fabric-react/hotfix_7-office-ui-fabric-react-5.79.1_2020-06-18-06-33.json
new file mode 100644
index 0000000000000..4d2200ebb08e2
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_7-office-ui-fabric-react-5.79.1_2020-06-18-06-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "FocusZone: Remove role=presentation",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
index 288b828f23dcf..a7985e0203de3 100644
--- a/packages/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
@@ -30,7 +30,6 @@ exports[`Breadcrumb renders breadcumb correctly 1`] = `
         onFocus={[Function]}
         onKeyDown={[Function]}
         onMouseDownCapture={[Function]}
-        role="presentation"
       >
         <ol
           className="ms-Breadcrumb-list"
@@ -174,7 +173,6 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
         onFocus={[Function]}
         onKeyDown={[Function]}
         onMouseDownCapture={[Function]}
-        role="presentation"
       >
         <ol
           className="ms-Breadcrumb-list"
@@ -383,7 +381,6 @@ exports[`Breadcrumb renders breadcumb correctly 3`] = `
         onFocus={[Function]}
         onKeyDown={[Function]}
         onMouseDownCapture={[Function]}
-        role="presentation"
       >
         <ol
           className="ms-Breadcrumb-list"
diff --git a/packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap
index 507065a96d6f5..9460c0ae3fb5d 100644
--- a/packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap
@@ -94,7 +94,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
               onFocus={[Function]}
               onKeyDown={[Function]}
               onMouseDownCapture={[Function]}
-              role="presentation"
             >
               <table
                 aria-activedescendant="DatePickerDay-active9"
@@ -961,7 +960,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
               onFocus={[Function]}
               onKeyDown={[Function]}
               onMouseDownCapture={[Function]}
-              role="presentation"
             >
               <div
                 className="ms-DatePicker-optionGrid"
diff --git a/packages/office-ui-fabric-react/src/components/DetailsList/__snapshots__/DetailsList.test.tsx.snap b/packages/office-ui-fabric-react/src/components/DetailsList/__snapshots__/DetailsList.test.tsx.snap
index 9923d8f6fb293..5e14bf98dc4f0 100644
--- a/packages/office-ui-fabric-react/src/components/DetailsList/__snapshots__/DetailsList.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/DetailsList/__snapshots__/DetailsList.test.tsx.snap
@@ -206,7 +206,6 @@ exports[`DetailsList renders List correctly 1`] = `
           onFocus={[Function]}
           onKeyDown={[Function]}
           onMouseDownCapture={[Function]}
-          role="presentation"
         >
           <div
             className="ms-SelectionZone"
diff --git a/packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx b/packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx
index 6823e02c0e7b1..779445b77ba59 100644
--- a/packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx
+++ b/packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx
@@ -129,7 +129,6 @@ export class FocusZone extends BaseComponent<IFocusZoneProps, {}> implements IFo
 
     return (
       <Tag
-        role='presentation'
         {
         ...divProps
         }
diff --git a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
index b1e5e6fd2fb61..176238c9d7b10 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
@@ -9,7 +9,6 @@ exports[`Nav renders Nav correctly 1`] = `
   onFocus={[Function]}
   onKeyDown={[Function]}
   onMouseDownCapture={[Function]}
-  role="presentation"
 >
   <nav
     aria-label={undefined}
diff --git a/packages/office-ui-fabric-react/src/components/Pivot/__snapshots__/Pivot.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Pivot/__snapshots__/Pivot.test.tsx.snap
index 225f07e583fc7..76f2e18776969 100644
--- a/packages/office-ui-fabric-react/src/components/Pivot/__snapshots__/Pivot.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Pivot/__snapshots__/Pivot.test.tsx.snap
@@ -10,7 +10,6 @@ exports[`Pivot renders Pivot correctly 1`] = `
     onFocus={[Function]}
     onKeyDown={[Function]}
     onMouseDownCapture={[Function]}
-    role="presentation"
   >
     <ul
       className="ms-Pivot"
diff --git a/packages/office-ui-fabric-react/src/components/Rating/__snapshots__/Rating.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Rating/__snapshots__/Rating.test.tsx.snap
index 686bdd8cd9267..ed80dd0f052b2 100644
--- a/packages/office-ui-fabric-react/src/components/Rating/__snapshots__/Rating.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Rating/__snapshots__/Rating.test.tsx.snap
@@ -21,7 +21,6 @@ exports[`Rating Renders Rating correctly 1`] = `
     onFocus={[Function]}
     onKeyDown={[Function]}
     onMouseDownCapture={[Function]}
-    role="presentation"
     tabIndex={-1}
   >
     <button
diff --git a/packages/office-ui-fabric-react/src/components/SwatchColorPicker/__snapshots__/SwatchColorPicker.test.tsx.snap b/packages/office-ui-fabric-react/src/components/SwatchColorPicker/__snapshots__/SwatchColorPicker.test.tsx.snap
index 0a55445b0bccb..80b70715e10be 100644
--- a/packages/office-ui-fabric-react/src/components/SwatchColorPicker/__snapshots__/SwatchColorPicker.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/SwatchColorPicker/__snapshots__/SwatchColorPicker.test.tsx.snap
@@ -17,7 +17,6 @@ exports[`SwatchColorPicker renders SwatchColorPicker correctly 1`] = `
   onFocus={[Function]}
   onKeyDown={[Function]}
   onMouseDownCapture={[Function]}
-  role="presentation"
 >
   <table
     aria-posinset={undefined}
diff --git a/packages/office-ui-fabric-react/src/components/pickers/__snapshots__/BasePicker.test.tsx.snap b/packages/office-ui-fabric-react/src/components/pickers/__snapshots__/BasePicker.test.tsx.snap
index 6ed2487d4f220..2bf8a93b88fae 100644
--- a/packages/office-ui-fabric-react/src/components/pickers/__snapshots__/BasePicker.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/pickers/__snapshots__/BasePicker.test.tsx.snap
@@ -13,7 +13,6 @@ exports[`Pickers BasePicker renders BasePicker correctly 1`] = `
     onFocus={[Function]}
     onKeyDown={[Function]}
     onMouseDownCapture={[Function]}
-    role="presentation"
   >
     <div
       aria-live="assertive"
@@ -80,7 +79,6 @@ exports[`Pickers TagPicker renders TagPicker correctly 1`] = `
     onFocus={[Function]}
     onKeyDown={[Function]}
     onMouseDownCapture={[Function]}
-    role="presentation"
   >
     <div
       aria-live="assertive"

From 8f72cbbf1cfb6593548a2646f3f26e75d4f58175 Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Tue, 23 Jun 2020 11:19:39 -0700
Subject: [PATCH 04/13] Port #6244 to remove invalid aria-posinset and
 aria-setsize attributes in Commandbar (#13734)

---
 ...-fabric-react-5.79.1_2020-06-22-08-36.json | 11 +++++
 .../components/CommandBar/CommandBar.test.tsx | 44 -------------------
 .../src/components/CommandBar/CommandBar.tsx  | 19 ++------
 .../__snapshots__/CommandBar.test.tsx.snap    |  2 -
 4 files changed, 15 insertions(+), 61 deletions(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_8-office-ui-fabric-react-5.79.1_2020-06-22-08-36.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_8-office-ui-fabric-react-5.79.1_2020-06-22-08-36.json b/common/changes/office-ui-fabric-react/hotfix_8-office-ui-fabric-react-5.79.1_2020-06-22-08-36.json
new file mode 100644
index 0000000000000..18cbaa7e57270
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_8-office-ui-fabric-react-5.79.1_2020-06-22-08-36.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Commandbar: remove invalid aria-posinset and aria-setsize attributes",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.test.tsx b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.test.tsx
index 2783c1710eaed..7824d53954c51 100644
--- a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.test.tsx
+++ b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.test.tsx
@@ -43,50 +43,6 @@ describe('CommandBar', () => {
     expect(tree).toMatchSnapshot();
   });
 
-  it('adds the correct aria-setsize and -posinset attributes to the command bar items.', () => {
-    const items: IContextualMenuItem[] = [
-      {
-        name: 'TestText 1',
-        key: 'TestKey1',
-        className: 'item1',
-        subMenuProps: {
-          items: [
-            {
-              name: 'SubmenuText 1',
-              key: 'SubmenuKey1',
-              className: 'SubMenuClass'
-            }
-          ]
-        }
-      },
-      {
-        name: 'TestText 2',
-        key: 'TestKey2',
-        className: 'item2',
-      },
-      {
-        name: 'TestText 3',
-        key: 'TestKey3',
-        className: 'item3',
-      },
-    ];
-
-    const renderedContent = ReactTestUtils.renderIntoDocument<CommandBar>(
-      <CommandBar
-        items={ items }
-      />
-    ) as React.Component<CommandBar, {}>;
-    document.body.appendChild(ReactDOM.findDOMNode(renderedContent));
-
-    const [item1, item2, item3] = ['.item1', '.item2', '.item3'].map(i => document.querySelector(i)!.children[0]);
-    expect(item1.getAttribute('aria-setsize')).toBe('3');
-    expect(item2.getAttribute('aria-setsize')).toBe('3');
-    expect(item3.getAttribute('aria-setsize')).toBe('3');
-    expect(item1.getAttribute('aria-posinset')).toBe('1');
-    expect(item2.getAttribute('aria-posinset')).toBe('2');
-    expect(item3.getAttribute('aria-posinset')).toBe('3');
-  });
-
   it('opens a menu with deprecated IContextualMenuItem.items property', () => {
     const items: IContextualMenuItem[] = [
       {
diff --git a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx
index 000ff7d787639..59bd511f3a6b3 100644
--- a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx
+++ b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx
@@ -114,9 +114,6 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
         </div>
       );
     }
-    // Total # of menu items is regular items + far items + 1 for the ellipsis, if necessary
-    const setSize = renderedItems!.length + renderedFarItems!.length + (renderedOverflowItems && renderedOverflowItems.length > 0 ? 1 : 0);
-    let posInSet = 1;
 
     return (
       <div className={ css('ms-CommandBar', styles.root, className) } ref={ this._commandBarRegion }>
@@ -124,7 +121,7 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
         <FocusZone componentRef={ this._focusZone } className={ styles.container } direction={ FocusZoneDirection.horizontal } role='menubar' >
           <div className={ css('ms-CommandBar-primaryCommands', styles.primaryCommands) } ref={ this._commandSurface }>
             { renderedItems!.map(item => (
-              this._renderItemInCommandBar(item, posInSet++, setSize, expandedMenuItemKey!)
+              this._renderItemInCommandBar(item, expandedMenuItemKey!)
             )).concat((renderedOverflowItems && renderedOverflowItems.length) ? [
               <div className={ css('ms-CommandBarItem', styles.item) } key={ OVERFLOW_KEY } ref={ this._overflow }>
                 <button
@@ -138,8 +135,6 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
                   aria-expanded={ this.state.expandedMenuItemKey === OVERFLOW_KEY }
                   aria-label={ this.props.elipisisAriaLabel || '' }
                   aria-haspopup={ true }
-                  aria-setsize={ setSize }
-                  aria-posinset={ posInSet++ }
                   data-automation-id='commandBarOverflow'
                 >
                   <Icon className={ css('ms-CommandBarItem-overflow', styles.itemOverflow) } iconName='more' />
@@ -149,7 +144,7 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
           </div>
           <div className={ css('ms-CommandBar-sideCommands', styles.sideCommands) } ref={ this._farCommandSurface }>
             { renderedFarItems!.map(item => (
-              this._renderItemInCommandBar(item, posInSet++, setSize, expandedMenuItemKey!, true)
+              this._renderItemInCommandBar(item, expandedMenuItemKey!, true)
             )) }
           </div>
         </FocusZone>
@@ -173,7 +168,7 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
     focusZone && focusZone.focus();
   }
 
-  private _renderItemInCommandBar(item: ICommandBarItemProps, posInSet: number, setSize: number, expandedMenuItemKey: string, isFarItem?: boolean) {
+  private _renderItemInCommandBar(item: ICommandBarItemProps, expandedMenuItemKey: string, isFarItem?: boolean) {
     if (item.onRender) {
       return (
         <div className={ css('ms-CommandBarItem', styles.item, item.className) } key={ item.key } ref={ item.key }>
@@ -182,7 +177,7 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
       );
     }
 
-    const itemKey = item.key || String(posInSet);
+    const itemKey = item.key;
     const isLink = item.onClick || hasSubmenu(item);
     const className = css(
       isLink ? ('ms-CommandBarItem-link ' + styles.itemLink) : ('ms-CommandBarItem-text ' + styles.itemText),
@@ -217,8 +212,6 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
           aria-haspopup={ hasSubmenu(item) }
           role='menuitem'
           aria-label={ ariaLabel }
-          aria-setsize={ setSize }
-          aria-posinset={ posInSet }
         >
           { (hasIcon) ? this._renderIcon(item) : (null) }
           { isNameVisible && (
@@ -244,8 +237,6 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
           aria-expanded={ hasSubmenu(item) ? expandedMenuItemKey === item.key : undefined }
           role='menuitem'
           aria-label={ ariaLabel }
-          aria-setsize={ setSize }
-          aria-posinset={ posInSet }
         >
           { (hasIcon) ? this._renderIcon(item) : (null) }
           { isNameVisible && (
@@ -272,8 +263,6 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
           data-command-key={ itemKey }
           aria-haspopup={ hasSubmenu(item) }
           aria-label={ ariaLabel }
-          aria-setsize={ setSize }
-          aria-posinset={ posInSet }
         >
           { (hasIcon) ? this._renderIcon(item) : (null) }
           { (isNameVisible) && (
diff --git a/packages/office-ui-fabric-react/src/components/CommandBar/__snapshots__/CommandBar.test.tsx.snap b/packages/office-ui-fabric-react/src/components/CommandBar/__snapshots__/CommandBar.test.tsx.snap
index cdfa05f114431..4a243536dc1cd 100644
--- a/packages/office-ui-fabric-react/src/components/CommandBar/__snapshots__/CommandBar.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/CommandBar/__snapshots__/CommandBar.test.tsx.snap
@@ -25,8 +25,6 @@ exports[`CommandBar renders CommandBar correctly 1`] = `
           aria-expanded={false}
           aria-haspopup={true}
           aria-label={undefined}
-          aria-posinset={1}
-          aria-setsize={1}
           className="ms-CommandBarItem-link undefined"
           data-command-key="TestKey1"
           id="CommandBar0TestKey1"

From e27273dba6cf430f0c9716933b5e109698e27771 Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Tue, 13 Oct 2020 22:53:17 +0800
Subject: [PATCH 05/13] Port #10008 to update Nav to latest redlines in
 office-ui-fabric-react/5.79.1 (#14933)

* Nav: update to latest redlines

* add change log

Co-authored-by: Jon Schectman <joschect@microsoft.com>
---
 ...ice-ui-fabric-react-5.79.1_2020-09-08-09-40.json | 11 +++++++++++
 ...ice-ui-fabric-react-5.79.1_2020-09-08-09-40.json | 11 +++++++++++
 .../src/components/Nav/Nav.styles.ts                | 13 ++++++-------
 .../components/Nav/__snapshots__/Nav.test.tsx.snap  |  3 +--
 packages/styling/src/interfaces/ISemanticColors.ts  | 12 ++++++++++++
 packages/styling/src/styles/theme.ts                |  2 ++
 6 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 common/changes/@uifabric/styling/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json

diff --git a/common/changes/@uifabric/styling/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json b/common/changes/@uifabric/styling/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json
new file mode 100644
index 0000000000000..e55dd12f43fa3
--- /dev/null
+++ b/common/changes/@uifabric/styling/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/styling",
+      "comment": "Semantic slots: add bodyBackgroundHovered and bodyBackgroundSelected",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@uifabric/styling",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json b/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json
new file mode 100644
index 0000000000000..c40d5eb8f1a05
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-08-09-40.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Nav: update to latest redlines",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
index cc80fb46bebd1..f99ef31ab924c 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
+++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
@@ -71,8 +71,7 @@ export const getStyles = (
       {
         display: 'block',
         position: 'relative',
-        color: semanticColors.bodyText,
-        backgroundColor: semanticColors.bodyBackground,
+        color: semanticColors.bodyText
       },
       isExpanded && 'is-expanded',
       isSelected && 'is-selected'
@@ -95,13 +94,13 @@ export const getStyles = (
         paddingRight: rightPadding,
         selectors: {
           '.ms-Nav-compositeLink:hover &': {
-            backgroundColor: palette.neutralLighterAlt,
+            backgroundColor: semanticColors.bodyBackgroundHovered,
             color: semanticColors.bodyText
           },
         },
       },
       isSelected && {
-        color: palette.themePrimary,
+        color: semanticColors.bodyTextChecked,
         backgroundColor: palette.neutralLighter,
         selectors: {
           '&:after': {
@@ -143,11 +142,11 @@ export const getStyles = (
           },
           '&:hover': {
             color: semanticColors.bodyText,
-            backgroundColor: palette.neutralLighterAlt
+            backgroundColor: semanticColors.bodyBackgroundHovered
           },
           '$compositeLink:hover &': {
             color: semanticColors.bodyText,
-            backgroundColor: palette.neutralLighterAlt
+            backgroundColor: semanticColors.bodyBackgroundHovered
           },
         }
       },
@@ -174,7 +173,7 @@ export const getStyles = (
       ],
       isSelected && {
         color: palette.themePrimary,
-        backgroundColor: palette.neutralLighterAlt,
+        backgroundColor: semanticColors.bodyBackgroundChecked,
         selectors: {
           '&:after': {
             borderLeft: `2px solid ${palette.themePrimary}`,
diff --git a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
index 176238c9d7b10..6e3321729b024 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
@@ -66,7 +66,6 @@ exports[`Nav renders Nav correctly 1`] = `
               className=
                   ms-Nav-compositeLink
                   {
-                    background-color: #ffffff;
                     color: #333333;
                     display: block;
                     position: relative;
@@ -136,7 +135,7 @@ exports[`Nav renders Nav correctly 1`] = `
                       top: -2px;
                     }
                     .ms-Nav-compositeLink:hover & {
-                      background-color: #f8f8f8;
+                      background-color: #f4f4f4;
                       color: #333333;
                     }
                     &:hover {
diff --git a/packages/styling/src/interfaces/ISemanticColors.ts b/packages/styling/src/interfaces/ISemanticColors.ts
index 2574465261467..0aa3e4edfe7e6 100644
--- a/packages/styling/src/interfaces/ISemanticColors.ts
+++ b/packages/styling/src/interfaces/ISemanticColors.ts
@@ -61,6 +61,18 @@ export interface ISemanticColors {
    */
   bodyText: string;
 
+  /**
+   * The default hover color for the backgrounds of interactable elements that don't have their own backgrounds.
+   * e.g. if links had hover backgrounds, they'd use this
+   */
+  bodyBackgroundHovered: string;
+
+  /**
+   * The default background color of selected interactable elements that don't have their own backgrounds.
+   * e.g. indicates in the nav which page you're currently on
+   */
+  bodyBackgroundChecked: string;
+
   /**
    * Checked text color, e.g. selected menu item text.
    */
diff --git a/packages/styling/src/styles/theme.ts b/packages/styling/src/styles/theme.ts
index 2611df309824f..93fab0f174919 100644
--- a/packages/styling/src/styles/theme.ts
+++ b/packages/styling/src/styles/theme.ts
@@ -120,6 +120,8 @@ export function createTheme(theme: IPartialTheme): ITheme {
 function _makeSemanticColorsFromPalette(p: IPalette, isInverted: boolean): ISemanticColors {
   let toReturn: ISemanticColors = {
     bodyBackground: p.white,
+    bodyBackgroundHovered: p.neutralLighter,
+    bodyBackgroundChecked: p.neutralLight,
     bodyText: p.neutralPrimary,
     bodyTextChecked: p.black,
     bodySubtext: p.neutralSecondary,

From ef968016e2d1627be4c900af5ced0b9070844ae0 Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Tue, 13 Oct 2020 23:06:56 +0800
Subject: [PATCH 06/13] Port #5782 & #12395 to add aria-level=1 in Dialog/Panel
 of office-ui-fabric-react/5.79.1 (#14944)

* Add aria-level = 1 in Dialog/Panel

* add change log

* code format

* code formatting

Co-authored-by: Jon Schectman <joschect@microsoft.com>
---
 ...ffice-ui-fabric-react-5.79.1_2020-09-09-04-40.json | 11 +++++++++++
 .../src/components/Dialog/DialogContent.base.tsx      |  2 +-
 .../Dialog/__snapshots__/Dialog.test.tsx.snap         |  1 +
 .../src/components/Panel/Panel.tsx                    |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_12-office-ui-fabric-react-5.79.1_2020-09-09-04-40.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_12-office-ui-fabric-react-5.79.1_2020-09-09-04-40.json b/common/changes/office-ui-fabric-react/hotfix_12-office-ui-fabric-react-5.79.1_2020-09-09-04-40.json
new file mode 100644
index 0000000000000..cdf5be157f073
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_12-office-ui-fabric-react-5.79.1_2020-09-09-04-40.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Add aria-level = 1 in Dialog/Panel",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Dialog/DialogContent.base.tsx b/packages/office-ui-fabric-react/src/components/Dialog/DialogContent.base.tsx
index a956ee6dec949..0bc1d76d49425 100644
--- a/packages/office-ui-fabric-react/src/components/Dialog/DialogContent.base.tsx
+++ b/packages/office-ui-fabric-react/src/components/Dialog/DialogContent.base.tsx
@@ -62,7 +62,7 @@ export class DialogContentBase extends BaseComponent<IDialogContentProps, {}> {
     return (
       <div className={ classNames.content }>
         <div className={ classNames.header }>
-          <p className={ classNames.title } id={ titleId } role='heading'>{ title }</p>
+          <p className={ classNames.title } id={ titleId } role='heading' aria-level={ 1 }>{ title }</p>
           <div className={ classNames.topButton }>
             { this.props.topButtonsProps!.map((props) => (
               <IconButton { ...props } />
diff --git a/packages/office-ui-fabric-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
index 6bc6a37f4a403..8c4c63c2dca0b 100644
--- a/packages/office-ui-fabric-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`Dialog renders Dialog correctly 1`] = `
         }
   >
     <p
+      aria-level={1}
       className=
           ms-Dialog-title
           {
diff --git a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
index 90cb2aa87a666..52584b418b3c3 100644
--- a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
+++ b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
@@ -271,6 +271,7 @@ export class Panel extends BaseComponent<IPanelProps, IPanelState> implements IP
             className={ css('ms-Panel-headerText', styles.headerText, headerClassName) }
             id={ headerTextId }
             role='heading'
+            aria-level={ 1 }
           >
             { headerText }
           </p>

From 738b2e4748b0f2d6292ac2c36b5519fc87a9db8d Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Tue, 13 Oct 2020 23:52:56 +0800
Subject: [PATCH 07/13] Port #8842 to add tooltip for cancel button in Panel of
 office-ui-fabric-react/5.79.1 (#14945)

* Add tooltip for cancel button in panel

* add change log

Co-authored-by: Jon Schectman <joschect@microsoft.com>
---
 ...ffice-ui-fabric-react-5.79.1_2020-09-09-05-33.json | 11 +++++++++++
 .../src/components/Panel/Panel.tsx                    |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_13-office-ui-fabric-react-5.79.1_2020-09-09-05-33.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_13-office-ui-fabric-react-5.79.1_2020-09-09-05-33.json b/common/changes/office-ui-fabric-react/hotfix_13-office-ui-fabric-react-5.79.1_2020-09-09-05-33.json
new file mode 100644
index 0000000000000..a883c71d513b0
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_13-office-ui-fabric-react-5.79.1_2020-09-09-05-33.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Added the title attribute for the cancel icon in the Panel which is same as aira-label",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
index 52584b418b3c3..ff21da35db075 100644
--- a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
+++ b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx
@@ -245,6 +245,7 @@ export class Panel extends BaseComponent<IPanelProps, IPanelState> implements IP
             className={ css('ms-Panel-closeButton ms-PanelAction-close') }
             onClick={ this._onPanelClick }
             ariaLabel={ closeButtonAriaLabel }
+            title={ closeButtonAriaLabel }
             data-is-visible={ true }
             iconProps={ { iconName: 'Cancel' } }
           />

From 74df6239a88f82825266cdcf5e6828432b8a82ca Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Wed, 14 Oct 2020 00:31:22 +0800
Subject: [PATCH 08/13] Port #6836 to fix typo in role attribute in
 DocumentCardActivity of office-ui-fabric-react/5.79.1 (#14932)

* Fix typo in role attribute in DocumentCardActivity

* add change log

Co-authored-by: Jon Schectman <joschect@microsoft.com>
---
 ...ffice-ui-fabric-react-5.79.1_2020-09-08-07-55.json | 11 +++++++++++
 .../components/DocumentCard/DocumentCardActivity.tsx  |  2 +-
 .../__snapshots__/DocumentCard.test.tsx.snap          |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_11-office-ui-fabric-react-5.79.1_2020-09-08-07-55.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_11-office-ui-fabric-react-5.79.1_2020-09-08-07-55.json b/common/changes/office-ui-fabric-react/hotfix_11-office-ui-fabric-react-5.79.1_2020-09-08-07-55.json
new file mode 100644
index 0000000000000..46e4f594cd6f0
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_11-office-ui-fabric-react-5.79.1_2020-09-08-07-55.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Fix typo in role attribute in DocumentCardActivity",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCardActivity.tsx b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCardActivity.tsx
index a39d134b7c158..0a0bdf69f4300 100644
--- a/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCardActivity.tsx
+++ b/packages/office-ui-fabric-react/src/components/DocumentCard/DocumentCardActivity.tsx
@@ -47,7 +47,7 @@ export class DocumentCardActivity extends BaseComponent<IDocumentCardActivityPro
           imageUrl={ person.profileImageSrc }
           initialsColor={ person.initialsColor }
           allowPhoneInitials={ person.allowPhoneInitials }
-          role='persentation'
+          role='presentation'
           size={ PersonaSize.size32 }
         />
 
diff --git a/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap b/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
index a330d78846085..d8a77cd3e6cd7 100644
--- a/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`DocumentCard renders DocumentCard correctly 1`] = `
       >
         <div
           className="ms-Persona-coin ms-Persona--size32 undefined"
-          role="persentation"
+          role="presentation"
           size={11}
         >
           <div

From 3adeea4b6e2c1b7b88f7e830eece9be223c97edd Mon Sep 17 00:00:00 2001
From: Elizabeth Craig <elcraig@microsoft.com>
Date: Tue, 20 Oct 2020 23:06:21 -0700
Subject: [PATCH 09/13] Update CODEOWNERS

---
 .github/CODEOWNERS | 110 +--------------------------------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 853c516dad689..5dc6ac40065f8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,108 +1,2 @@
-# This is a comment.
-# Each line is a file pattern followed by one or more owners.
-
-# These owners will be the default owners for everything in the repo.
-# Unless a later match takes precedence, @global-owner1 and @global-owner2
-# will be requested for review when someone opens a pull request.
-# *   @global-owner1 @global-owner2
-
-# Order is important; the last matching pattern takes the most precedence.
-# When someone opens a pull request that only modifies JS files, only @js-owner
-# and not the global owner(s) will be requested for a review.
-# *.js@js-owner
-
-# You can also use email addresses if you prefer. They'll be used to look up
-# users just like we do for commit author emails.
-# docs/  docs@example.com
-
-#### Core build stuff
-scripts/ @dzearing
-
-#### Apps
-# component-demo/
-# fabric-website/
-# ssr-tests/
-# test-bundle-button/ @dzearing
-# todo-app/
-
-#### Packages
-# packages/example-app-base/
-packages/file-type-icons/  @KatherineThayerMicrosoft @jahnp @bigbadcapers
-# packages/icons/
-# packages/jest-serializer-merge-styles/
-# packages/merge-styles/
-# packages/office-ui-fabric-react-tslint/
-packages/styling/ @dzearing
-packages/styling/src/interfaces/ @phkuo
-packages/styling/src/styles/ @phkuo
-# packages/utilities/
-packages/utilities/positioning/ @joschect
-
-### Fabric
-# common/
-common/_semanticSlots.scss  @phkuo
-common/_themeOverrides.scss @phkuo
-common/_common.scss @phkuo
-
-### Utilities
-dateMath/     @lorejoh12 @sathi23
-dateValues/   @lorejoh12 @sathi23
-
-## Components
-# ActivityItem/
-# Breadcrumb/
-# Button/
-Calendar/   @lorejoh12 @sathi23
-Callout/  @joschect
-# Check/
-# Checkbox/
-ChoiceGroup/   @srideshpande
-# ColorPicker/
-# ComboBox/
-CommandBar/   @micahgodbolt
-ContextualMenu/  @joschect
-DatePicker/   @lorejoh12 @sathi23
-# DetailsList/
-# Dialog/
-DocumentCard/ @yiminwu @mikewheaton
-# Dropdown/
-# Fabric/
-# FacePile/
-# FocusTrapZone/
-# FocusZone/
-GroupedList/  @aditima
-HoverCard/   @atneik @Jahnp
-# Icon/
-# Image/
-# Label/
-Layer/  @ThomasMichon
-# Link/
-List/  @cschleiden
-# MarqueeSelection/
-# MessageBar/
-# Modal/
-# Nav/
-OverflowSet/  @micahgodbolt
-# Overlay/
-# Panel/
-# Persona/
-Persona/PersonaCoin.tsx @mtennoe @jakob101
-Persona/PersonaConsts.tsx @mtennoe @jakob101
-pickers/  @joschect
-# Pivot/
-# Popup/
-# ProgressIndicator/
-Rating/  @cschleiden
-ResizeGroup/  @micahgodbolt
-# SearchBox/
-# Slider/
-# SpinButton/
-# Spinner/
-# SwatchColorPicker/
-TeachingBubble/   @micahgodbolt
-# TextField/
-# Theme/
-Toggle/  @phkuo
-Tooltip/  @micahgodbolt
-
-
+# This branch is owned by the SP 2019 on-prem team
+* @Phoebe-0319 @Liuqingbo @TimKaibingchen

From 1d3e0741264d950b3c548a9bcdeb8698ea49d18c Mon Sep 17 00:00:00 2001
From: Elizabeth Craig <elcraig@microsoft.com>
Date: Tue, 20 Oct 2020 23:09:14 -0700
Subject: [PATCH 10/13] Update CODEOWNERS

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5dc6ac40065f8..511ec828c21b0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
-# This branch is owned by the SP 2019 on-prem team
-* @Phoebe-0319 @Liuqingbo @TimKaibingchen
+# This branch is owned by the SP 2019 on-prem team (plus joschect as point of contact)
+* @Phoebe-0319 @Liuqingbo @TimKaibingchen @joschect

From 9d1395705697db29b4d8dd137babdb9f971ff9b4 Mon Sep 17 00:00:00 2001
From: Elizabeth Craig <elcraig@microsoft.com>
Date: Tue, 27 Oct 2020 22:09:06 -0700
Subject: [PATCH 11/13] Add yaml pipeline for hotfixes

---
 azure-pipelines.hotfix.yml | 49 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 azure-pipelines.hotfix.yml

diff --git a/azure-pipelines.hotfix.yml b/azure-pipelines.hotfix.yml
new file mode 100644
index 0000000000000..038b783c162f8
--- /dev/null
+++ b/azure-pipelines.hotfix.yml
@@ -0,0 +1,49 @@
+pr: none
+
+trigger: none
+
+name: '$(targetNpmVersion) ($(Rev:r))'
+
+variables:
+  - group: 'Github and NPM secrets'
+
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+steps:
+  - task: NodeTool@0
+    displayName: 'Use Node 8.x'
+    inputs:
+      versionSpec: 8.x
+
+  - script: |
+      node -e "if('$(targetNpmVersion)' === '') throw new Error('targetNpmVersion is not specified');"
+    displayName: 'Checking for targetNpmVersion variable'
+
+  - script: |
+      npm install semver
+      node -e "let semver = require('semver');if(semver.valid('$(targetNpmVersion)') === null){ throw new Error('Invalid version specified'); }"
+    displayName: 'Check targetNpmVersion is valid semver'
+
+  - script: |
+      npm install --ignore-scripts
+      node node_modules/@microsoft/rush/bin/rush install --bypass-policy
+    displayName: rush install
+
+  - script: |
+      npm run build
+    displayName: rush build (Create production build)
+
+  - script: |
+      npm version $(targetNpmVersion)
+    workingDirectory: 'packages/office-ui-fabric-react'
+    displayName: 'Manually set package version'
+
+  - script: |
+      npm pack
+    displayName: 'Create tarball'
+    workingDirectory: 'packages/office-ui-fabric-react'
+
+  - script: |
+      npm publish packages/office-ui-fabric-react/office-ui-fabric-react-$(targetNpmVersion).tgz --tag hf5 --//registry.npmjs.org/:_authToken=$(npmToken)
+    displayName: Publish new version

From cc10c8bafa46e5cc439e13c9474543d3634c2cad Mon Sep 17 00:00:00 2001
From: leolewin <leolewin@smail.nju.edu.cn>
Date: Thu, 29 Oct 2020 13:27:00 +0800
Subject: [PATCH 12/13] fix nav in high contrast according the changes in
 master branch (#15265)

Co-authored-by: limingliu <liminliu@microsoft.com>
Co-authored-by: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
---
 ...ice-ui-fabric-react-5.79.1_2020-09-24-08-55.json | 11 +++++++++++
 .../src/components/Nav/Nav.styles.ts                | 13 +++++++++++--
 .../components/Nav/__snapshots__/Nav.test.tsx.snap  |  6 ++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-24-08-55.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-24-08-55.json b/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-24-08-55.json
new file mode 100644
index 0000000000000..bc4da973ec9cf
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_9-office-ui-fabric-react-5.79.1_2020-09-24-08-55.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "fix nav in high contrast according the changes in master branch",
+      "type": "minor"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "liminliu@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
index f99ef31ab924c..48b597f8ec06a 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
+++ b/packages/office-ui-fabric-react/src/components/Nav/Nav.styles.ts
@@ -5,7 +5,8 @@ import {
   DefaultFontStyles,
   getFocusStyle,
   FontSizes,
-  FontWeights
+  FontWeights,
+  HighContrastSelector
 } from '../../Styling';
 
 export const buttonStyles: IButtonStyles = {
@@ -97,7 +98,15 @@ export const getStyles = (
             backgroundColor: semanticColors.bodyBackgroundHovered,
             color: semanticColors.bodyText
           },
-        },
+          [HighContrastSelector]: {
+            border: 0,
+            selectors: {
+              ':focus': {
+                border: '1px solid WindowText'
+              }
+            }
+          }
+        }
       },
       isSelected && {
         color: semanticColors.bodyTextChecked,
diff --git a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
index 6e3321729b024..0ad7d22d9c8c7 100644
--- a/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Nav/__snapshots__/Nav.test.tsx.snap
@@ -138,6 +138,12 @@ exports[`Nav renders Nav correctly 1`] = `
                       background-color: #f4f4f4;
                       color: #333333;
                     }
+                    @media screen and (-ms-high-contrast: active){& {
+                      border: 0px;
+                    }
+                    @media screen and (-ms-high-contrast: active){&:focus {
+                      border: 1px solid WindowText;
+                    }
                     &:hover {
                       color: #0078d4;
                     }

From 3eef220ba36ce64ef46855a014d10f31a4f72884 Mon Sep 17 00:00:00 2001
From: Phoebe-0319 <60056296+Phoebe-0319@users.noreply.github.com>
Date: Wed, 20 Jan 2021 05:38:09 +0800
Subject: [PATCH 13/13] Port #8781 & #8905 to update color changes to
 PersonaInitialColors in office UI fabric react/5.79.1 (#16509)

* Update color changes to PersonaInitialColors

* add commit log
---
 ...-fabric-react-5.79.1_2021-01-18-07-44.json | 11 ++++++++
 .../__snapshots__/ActivityItem.test.tsx.snap  | 12 ++++-----
 .../__snapshots__/DocumentCard.test.tsx.snap  |  2 +-
 .../__snapshots__/Facepile.test.tsx.snap      |  2 +-
 .../Persona/PersonaInitialsColor.test.ts      |  2 +-
 .../Persona/PersonaInitialsColor.ts           | 26 +++++++++----------
 6 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 common/changes/office-ui-fabric-react/hotfix_14-office-ui-fabric-react-5.79.1_2021-01-18-07-44.json

diff --git a/common/changes/office-ui-fabric-react/hotfix_14-office-ui-fabric-react-5.79.1_2021-01-18-07-44.json b/common/changes/office-ui-fabric-react/hotfix_14-office-ui-fabric-react-5.79.1_2021-01-18-07-44.json
new file mode 100644
index 0000000000000..5b885c7e20624
--- /dev/null
+++ b/common/changes/office-ui-fabric-react/hotfix_14-office-ui-fabric-react-5.79.1_2021-01-18-07-44.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Update color changes to PersonaInitialColors",
+      "type": "minor"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "xianwang@microsoft.com"
+}
\ No newline at end of file
diff --git a/packages/office-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap b/packages/office-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap
index 0a547f83d7733..593c94aedfa7b 100644
--- a/packages/office-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap
@@ -73,7 +73,7 @@ exports[`ActivityItem renders compact with a single persona correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #2D89EF;
+                  background-color: #0078D4;
                 }
             style={undefined}
           >
@@ -305,7 +305,7 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #2D89EF;
+                  background-color: #0078D4;
                 }
             style={undefined}
           >
@@ -432,7 +432,7 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #00ABA9;
+                  background-color: #038387;
                 }
             style={undefined}
           >
@@ -566,7 +566,7 @@ exports[`ActivityItem renders with a single persona correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #2D89EF;
+                  background-color: #0078D4;
                 }
             style={undefined}
           >
@@ -811,7 +811,7 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #2D89EF;
+                  background-color: #0078D4;
                 }
             style={undefined}
           >
@@ -924,7 +924,7 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
             className=
                 ms-Persona-initials
                 {
-                  background-color: #00ABA9;
+                  background-color: #038387;
                 }
             style={undefined}
           >
diff --git a/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap b/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
index d8a77cd3e6cd7..408a2d0aac9d2 100644
--- a/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
@@ -42,7 +42,7 @@ exports[`DocumentCard renders DocumentCard correctly 1`] = `
               className=
                   ms-Persona-initials
                   {
-                    background-color: #2D89EF;
+                    background-color: #0078D4;
                   }
               style={undefined}
             >
diff --git a/packages/office-ui-fabric-react/src/components/Facepile/__snapshots__/Facepile.test.tsx.snap b/packages/office-ui-fabric-react/src/components/Facepile/__snapshots__/Facepile.test.tsx.snap
index 86f9938e10c61..85f0163463ad3 100644
--- a/packages/office-ui-fabric-react/src/components/Facepile/__snapshots__/Facepile.test.tsx.snap
+++ b/packages/office-ui-fabric-react/src/components/Facepile/__snapshots__/Facepile.test.tsx.snap
@@ -222,7 +222,7 @@ exports[`Facepile renders Facepile correctly 1`] = `
                 className=
                     ms-Persona-initials
                     {
-                      background-color: #1E7145;
+                      background-color: #0B6A0B;
                     }
                 style={undefined}
               >
diff --git a/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.test.ts b/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.test.ts
index e025e390afa4a..42689defdf470 100644
--- a/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.test.ts
+++ b/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.test.ts
@@ -7,7 +7,7 @@ describe('PersonaInitialsColor tests', () => {
     expect(colorCode).toEqual('#1D1D1D');
 
     const colorCode2 = initialsColorPropToColorCode({ primaryText: 'Annie Lindqvist' });
-    expect(colorCode2).toEqual('#00A300');
+    expect(colorCode2).toEqual('#498205');
   });
 
   it('uses provided enum initialsColor if one was specified', () => {
diff --git a/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.ts b/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.ts
index b934ecbd4b5da..2d3602536eaec 100644
--- a/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.ts
+++ b/packages/office-ui-fabric-react/src/components/Persona/PersonaInitialsColor.ts
@@ -47,35 +47,35 @@ function getInitialsColorFromName(displayName: string | undefined): PersonaIniti
 function personaInitialsColorToHexCode(personaInitialsColor: PersonaInitialsColor): string {
   switch (personaInitialsColor) {
     case PersonaInitialsColor.lightBlue:
-      return '#6BA5E7';
+      return '#4F6BED';
     case PersonaInitialsColor.blue:
-      return '#2D89EF';
+      return '#0078D4';
     case PersonaInitialsColor.darkBlue:
-      return '#2B5797';
+      return '#004E8C';
     case PersonaInitialsColor.teal:
-      return '#00ABA9';
+      return '#038387';
     case PersonaInitialsColor.lightGreen:
-      return '#99B433';
+      return '#498205';
     case PersonaInitialsColor.green:
-      return '#00A300';
+      return '#498205';
     case PersonaInitialsColor.darkGreen:
-      return '#1E7145';
+      return '#0B6A0B';
     case PersonaInitialsColor.lightPink:
-      return '#E773BD';
+      return '#C239B3';
     case PersonaInitialsColor.pink:
-      return '#FF0097';
+      return '#E3008C';
     case PersonaInitialsColor.magenta:
-      return ' #7E3878';
+      return ' #881798';
     case PersonaInitialsColor.purple:
-      return '#603CBA';
+      return '#5C2E91';
     case PersonaInitialsColor.black:
       return '#1D1D1D';
     case PersonaInitialsColor.orange:
-      return '#DA532C';
+      return '#CA5010';
     case PersonaInitialsColor.red:
       return '#EE1111';
     case PersonaInitialsColor.darkRed:
-      return '#B91D47';
+      return '#A4262C';
     case PersonaInitialsColor.transparent:
       return 'transparent';
   }