From 7a37b1d535e6ff41827d588afc4277d6d80f1886 Mon Sep 17 00:00:00 2001
From: Dallas <dallas.nicol@gmail.com>
Date: Fri, 14 Oct 2022 10:22:42 -0500
Subject: [PATCH] fix(Nav): horizontalsubnav aria label default to Local
 (#8213)

* fix(Nav): make aria label for horizontalsubnav default to Local

* update test snap

* update example custom aria labels as per pr comments
---
 packages/react-core/src/components/Nav/Nav.tsx                  | 2 +-
 .../components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap    | 2 +-
 packages/react-core/src/components/Nav/examples/NavDefault.tsx  | 2 +-
 .../react-core/src/components/Nav/examples/NavDrilldown.tsx     | 2 +-
 .../react-core/src/components/Nav/examples/NavExpandable.tsx    | 2 +-
 .../src/components/Nav/examples/NavExpandableThirdLevel.tsx     | 2 +-
 packages/react-core/src/components/Nav/examples/NavFlyout.tsx   | 2 +-
 packages/react-core/src/components/Nav/examples/NavGrouped.tsx  | 2 +-
 .../src/components/Nav/examples/NavHorizontalPageHeader.tsx     | 2 +-
 .../src/components/Nav/examples/NavHorizontalSubNav.tsx         | 2 +-
 .../src/components/Nav/examples/NavLegacyTertiary.tsx           | 2 +-
 packages/react-core/src/components/Nav/examples/NavMixed.tsx    | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/react-core/src/components/Nav/Nav.tsx b/packages/react-core/src/components/Nav/Nav.tsx
index 9be8164f521..974aef08f0f 100644
--- a/packages/react-core/src/components/Nav/Nav.tsx
+++ b/packages/react-core/src/components/Nav/Nav.tsx
@@ -163,7 +163,7 @@ export class Nav extends React.Component<
             this.state.isScrollable && styles.modifiers.scrollable,
             className
           )}
-          aria-label={ariaLabel || (variant === 'tertiary' ? 'Local' : 'Global')}
+          aria-label={ariaLabel || (['tertiary', 'horizontal-subnav'].includes(variant) ? 'Local' : 'Global')}
           {...getOUIAProps(Nav.displayName, ouiaId !== undefined ? ouiaId : this.state.ouiaStateId, ouiaSafe)}
           {...props}
         >
diff --git a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
index 869d7955e38..b33f9166be1 100644
--- a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
+++ b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap
@@ -664,7 +664,7 @@ exports[`Nav Horizontal Nav List 1`] = `
 exports[`Nav Horizontal SubNav List 1`] = `
 <DocumentFragment>
   <nav
-    aria-label="Global"
+    aria-label="Local"
     class="pf-c-nav pf-m-horizontal-subnav"
     data-ouia-component-id="OUIA-Generated-Nav-horizontal-subnav-1"
     data-ouia-component-type="PF4/Nav"
diff --git a/packages/react-core/src/components/Nav/examples/NavDefault.tsx b/packages/react-core/src/components/Nav/examples/NavDefault.tsx
index 77490f36fe2..4b234d66085 100644
--- a/packages/react-core/src/components/Nav/examples/NavDefault.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavDefault.tsx
@@ -9,7 +9,7 @@ export const NavDefault: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} aria-label="Default global nav">
+    <Nav onSelect={onSelect} aria-label="Default global">
       <NavList>
         <NavItem preventDefault id="nav-default-link1" to="#nav-default-link1" itemId={0} isActive={activeItem === 0}>
           Default Link 1
diff --git a/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx b/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
index 205595f78be..833b0e0d6d7 100644
--- a/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
@@ -70,7 +70,7 @@ export const NavigationDrilldown: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav aria-label="Drilldown global nav">
+    <Nav aria-label="Drilldown global">
       <Menu
         id="nav-drilldown-rootMenu"
         containsDrilldown
diff --git a/packages/react-core/src/components/Nav/examples/NavExpandable.tsx b/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
index fe2c5cc8c27..5f635fad866 100644
--- a/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
@@ -25,7 +25,7 @@ export const NavExpandableExample: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} onToggle={onToggle} aria-label="Expandable global nav">
+    <Nav onSelect={onSelect} onToggle={onToggle} aria-label="Expandable global">
       <NavList>
         <NavExpandable
           title="Expandable Group 1"
diff --git a/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx b/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
index 0305b71f30b..5b611cb0077 100644
--- a/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
@@ -16,7 +16,7 @@ export const NavExpandableThirdLevel: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} onToggle={onToggle} aria-label="Expandable third level global nav">
+    <Nav onSelect={onSelect} onToggle={onToggle} aria-label="Expandable third level global">
       <NavList>
         <NavExpandable
           title="Expandable section title 1"
diff --git a/packages/react-core/src/components/Nav/examples/NavFlyout.tsx b/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
index 503b84fe9b0..2ef83df4de6 100644
--- a/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
@@ -57,7 +57,7 @@ export const NavFlyout: React.FunctionComponent = () => {
   }
 
   return (
-    <Nav onSelect={onSelect} aria-label="Flyout global nav">
+    <Nav onSelect={onSelect} aria-label="Flyout global">
       <NavList>
         <NavItem
           preventDefault
diff --git a/packages/react-core/src/components/Nav/examples/NavGrouped.tsx b/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
index fc5029a0085..b3534a4992f 100644
--- a/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
@@ -9,7 +9,7 @@ export const NavGrouped: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} aria-label="Grouped global nav">
+    <Nav onSelect={onSelect} aria-label="Grouped global">
       <NavGroup title="Section title 1">
         <NavItem
           preventDefault
diff --git a/packages/react-core/src/components/Nav/examples/NavHorizontalPageHeader.tsx b/packages/react-core/src/components/Nav/examples/NavHorizontalPageHeader.tsx
index 9d1c4009722..1362d531d81 100644
--- a/packages/react-core/src/components/Nav/examples/NavHorizontalPageHeader.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavHorizontalPageHeader.tsx
@@ -9,7 +9,7 @@ export const NavHorizontalPageHeader: React.FunctionComponent = () => {
   };
 
   const nav = (
-    <Nav onSelect={onSelect} variant="horizontal" aria-label="Horizontal global nav">
+    <Nav onSelect={onSelect} variant="horizontal" aria-label="Horizontal global">
       <NavList>
         {Array.apply(0, Array(10)).map(function(_item, index: number) {
           const num = index + 1;
diff --git a/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx b/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
index 40ed7ebcd7d..4a145ac05e0 100644
--- a/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
@@ -9,7 +9,7 @@ export const NavHorizontalSubNav: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} variant="horizontal-subnav" aria-label="Horizontal subnav global nav">
+    <Nav onSelect={onSelect} variant="horizontal-subnav" aria-label="Horizontal subnav local">
       <NavList>
         {Array.apply(0, Array(10)).map(function(_item, index: number) {
           const num = index + 1;
diff --git a/packages/react-core/src/components/Nav/examples/NavLegacyTertiary.tsx b/packages/react-core/src/components/Nav/examples/NavLegacyTertiary.tsx
index d38ec335c22..f02687075ab 100644
--- a/packages/react-core/src/components/Nav/examples/NavLegacyTertiary.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavLegacyTertiary.tsx
@@ -9,7 +9,7 @@ export const NavLegacyTertiary: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} variant="tertiary" aria-label="Tertiary global nav">
+    <Nav onSelect={onSelect} variant="tertiary" aria-label="Tertiary local">
       <NavList>
         {Array.apply(0, Array(10)).map(function(_item, index: number) {
           const num = index + 1;
diff --git a/packages/react-core/src/components/Nav/examples/NavMixed.tsx b/packages/react-core/src/components/Nav/examples/NavMixed.tsx
index 17e5df49c67..9c6486787a6 100644
--- a/packages/react-core/src/components/Nav/examples/NavMixed.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavMixed.tsx
@@ -11,7 +11,7 @@ export const NavMixed: React.FunctionComponent = () => {
   };
 
   return (
-    <Nav onSelect={onSelect} aria-label="Mixed global nav">
+    <Nav onSelect={onSelect} aria-label="Mixed global">
       <NavList>
         <NavItem
           preventDefault