Merge pull request #1060 from primer/fix-aria-current

simurai · web-flow · commit 9798f56d2a49 · 2020-05-21T16:00:05.000+09:00
Add support for aria-current=false
diff --git a/src/breadcrumb/breadcrumb.scss b/src/breadcrumb/breadcrumb.scss
@@ -19,7 +19,7 @@
 }
 
 .breadcrumb-item-selected,
-.breadcrumb-item[aria-current] {
+.breadcrumb-item[aria-current]:not([aria-current=false]) {
   color: $text-gray;
 
   &::after {
diff --git a/src/navigation/filter-list.scss b/src/navigation/filter-list.scss
@@ -45,7 +45,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     color: $text-white;
     background-color: $bg-blue;
   }
diff --git a/src/navigation/menu.scss b/src/navigation/menu.scss
@@ -46,7 +46,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     font-weight: $font-weight-bold;
     color: $text-gray-dark;
     cursor: default;
diff --git a/src/navigation/sidenav.scss b/src/navigation/sidenav.scss
@@ -60,7 +60,7 @@
   background-color: $bg-white;
 }
 
-.SideNav-item[aria-current="page"],
+.SideNav-item[aria-current]:not([aria-current=false]),
 .SideNav-item[aria-selected="true"] {
   font-weight: $font-weight-semibold;
   color: $text-gray-dark;
@@ -104,7 +104,7 @@
   outline: none;
 }
 
-.SideNav-subItem[aria-current="page"],
+.SideNav-subItem[aria-current]:not([aria-current=false]),
 .SideNav-subItem[aria-selected="true"] {
   font-weight: $font-weight-semibold;
   color: $text-gray-dark;
diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss
@@ -41,7 +41,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     z-index: 2;
     color: $text-white;
     background-color: $bg-blue;
diff --git a/src/navigation/tabnav.scss b/src/navigation/tabnav.scss
@@ -31,7 +31,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     color: $text-gray-dark;
     background-color: $bg-white;
     border-color: $border-gray-dark;
diff --git a/src/navigation/underline-nav.scss b/src/navigation/underline-nav.scss
@@ -37,7 +37,7 @@
 
   &.selected,
   &[role=tab][aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     font-weight: $font-weight-bold;
     color: $text-gray-dark;
     // stylelint-disable-next-line primer/borders
diff --git a/src/pagination/pagination.scss b/src/pagination/pagination.scss
@@ -50,8 +50,7 @@
 
   .current,
   .current:hover,
-  [aria-current],
-  [aria-current]:hover {
+  [aria-current]:not([aria-current=false]) {
     z-index: 3;
     color: $text-white;
     background-color: $bg-blue;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`.breadcrumb-item-selected,`
`22`		`-.breadcrumb-item[aria-current] {`
	`22`	`+.breadcrumb-item[aria-current]:not([aria-current=false]) {`
`23`	`23`	`color: $text-gray;`
`24`	`24`
`25`	`25`	`&::after {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`
`46`	`46`	`&.selected,`
`47`	`47`	`&[aria-selected=true],`
`48`		`- &[aria-current] {`
	`48`	`+ &[aria-current]:not([aria-current=false]) {`
`49`	`49`	`color: $text-white;`
`50`	`50`	`background-color: $bg-blue;`
`51`	`51`	`}`