From cd9966f0a1416fcf7c4702828d7dd9b369a39e3f Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 14:21:55 +0200
Subject: [PATCH 01/12] fix accessibility issue first

---
 packages/react/src/StateLabel/StateLabel.tsx | 22 +++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 28fb261353f..4b9af7b278a 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -33,6 +33,19 @@ const octiconMap = {
   unavailable: AlertIcon,
 }
 
+const labelMap = {
+  issueOpened: 'Issue',
+  pullOpened: 'Pull request',
+  issueClosed: 'Issue',
+  issueClosedNotPlanned: 'Issue',
+  pullClosed: 'Pull request',
+  pullMerged: 'Pull request',
+  draft: 'Pull request',
+  issueDraft: 'Issue',
+  pullQueued: 'Pull request',
+  unavailable: '',
+}
+
 const colorVariants = variant({
   prop: 'status',
   variants: {
@@ -120,7 +133,14 @@ function StateLabel({children, status, variant: variantProp = 'normal', ...rest}
   return (
     <StateLabelBase {...rest} variant={variantProp} status={status}>
       {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
-      {status && <Octicon {...octiconProps} icon={octiconMap[status] || QuestionIcon} sx={{mr: 1}} />}
+      {status && (
+        <Octicon
+          {...octiconProps}
+          icon={octiconMap[status] || QuestionIcon}
+          aria-label={labelMap[status]}
+          sx={{mr: 1}}
+        />
+      )}
       {children}
     </StateLabelBase>
   )

From 17a092227a28aae519087640ff12b0e48207144a Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 14:22:56 +0200
Subject: [PATCH 02/12] stronger types

---
 packages/react/src/StateLabel/StateLabel.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 4b9af7b278a..5aba22dc172 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -33,7 +33,7 @@ const octiconMap = {
   unavailable: AlertIcon,
 }
 
-const labelMap = {
+const labelMap: Record<keyof typeof octiconMap, 'Issue' | 'Pull request' | ''> = {
   issueOpened: 'Issue',
   pullOpened: 'Pull request',
   issueClosed: 'Issue',
@@ -133,14 +133,7 @@ function StateLabel({children, status, variant: variantProp = 'normal', ...rest}
   return (
     <StateLabelBase {...rest} variant={variantProp} status={status}>
       {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
-      {status && (
-        <Octicon
-          {...octiconProps}
-          icon={octiconMap[status] || QuestionIcon}
-          aria-label={labelMap[status]}
-          sx={{mr: 1}}
-        />
-      )}
+      {status && <Octicon {...octiconProps} icon={octiconMap[status]} aria-label={labelMap[status]} sx={{mr: 1}} />}
       {children}
     </StateLabelBase>
   )

From ea6bc8fe4b0184b61191402d6da14aa01c16ba99 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 15:55:18 +0200
Subject: [PATCH 03/12] add tests, update snapshots

---
 .../StateLabel/__tests__/StateLabel.test.tsx  | 10 ++++++++
 .../__snapshots__/StateLabel.test.tsx.snap    | 24 ++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/packages/react/src/StateLabel/__tests__/StateLabel.test.tsx b/packages/react/src/StateLabel/__tests__/StateLabel.test.tsx
index f7a492b1d6a..1739f891ce9 100644
--- a/packages/react/src/StateLabel/__tests__/StateLabel.test.tsx
+++ b/packages/react/src/StateLabel/__tests__/StateLabel.test.tsx
@@ -43,4 +43,14 @@ describe('StateLabel', () => {
   it('renders children', () => {
     expect(render(<StateLabel status="issueOpened">hi</StateLabel>)).toMatchSnapshot()
   })
+
+  it('adds label to icon', () => {
+    const screen1 = HTMLRender(<StateLabel status="issueOpened">Open</StateLabel>)
+    expect(screen1.getByLabelText('Issue')).toBeInTheDocument() // svg
+    expect(screen1.getByText('Open')).toBeInTheDocument() // text
+
+    const screen2 = HTMLRender(<StateLabel status="pullMerged">Merged</StateLabel>)
+    expect(screen2.getByLabelText('Pull request')).toBeInTheDocument() // svg
+    expect(screen2.getByText('Merged')).toBeInTheDocument() // text
+  })
 })
diff --git a/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap b/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
index abf071fef16..9fa743d45f8 100644
--- a/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
+++ b/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
@@ -32,11 +32,12 @@ exports[`StateLabel renders children 1`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -91,11 +92,12 @@ exports[`StateLabel respects the status prop 1`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -149,11 +151,12 @@ exports[`StateLabel respects the status prop 2`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -207,11 +210,12 @@ exports[`StateLabel respects the status prop 3`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -262,11 +266,12 @@ exports[`StateLabel respects the status prop 4`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Pull request"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -317,11 +322,12 @@ exports[`StateLabel respects the status prop 5`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Pull request"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -372,11 +378,12 @@ exports[`StateLabel respects the variant prop 1`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",
@@ -430,11 +437,12 @@ exports[`StateLabel respects the variant prop 2`] = `
   className="c0"
 >
   <svg
-    aria-hidden="true"
+    aria-label="Issue"
     className="c1"
     fill="currentColor"
     focusable="false"
     height={16}
+    role="img"
     style={
       {
         "display": "inline-block",

From ddafb9e3a300164e87982b71d33661243a91a917 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 17:09:55 +0200
Subject: [PATCH 04/12] remove unused icon

---
 packages/react/src/StateLabel/StateLabel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 5aba22dc172..8dc421fcb0b 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -7,7 +7,6 @@ import {
   SkipIcon,
   IssueDraftIcon,
   IssueOpenedIcon,
-  QuestionIcon,
   GitMergeQueueIcon,
   AlertIcon,
 } from '@primer/octicons-react'

From 13b0499f04fcce0a1f0433e330232fe8f4391328 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 17:11:13 +0200
Subject: [PATCH 05/12] remove unrelated changes

---
 packages/react/src/StateLabel/StateLabel.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 8dc421fcb0b..25bebf72b72 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -4,6 +4,7 @@ import {
   GitPullRequestClosedIcon,
   GitPullRequestDraftIcon,
   IssueClosedIcon,
+  QuestionIcon,
   SkipIcon,
   IssueDraftIcon,
   IssueOpenedIcon,
@@ -132,7 +133,7 @@ function StateLabel({children, status, variant: variantProp = 'normal', ...rest}
   return (
     <StateLabelBase {...rest} variant={variantProp} status={status}>
       {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
-      {status && <Octicon {...octiconProps} icon={octiconMap[status]} aria-label={labelMap[status]} sx={{mr: 1}} />}
+      {status && <Octicon {...octiconProps} icon={octiconMap[status] || QuestionIcon} aria-label={labelMap[status]} sx={{mr: 1}} />}
       {children}
     </StateLabelBase>
   )

From 819706df2422f1e1988ba0c79147749d14283ca8 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 17:11:36 +0200
Subject: [PATCH 06/12] remove unrelated changes

---
 packages/react/src/StateLabel/StateLabel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 25bebf72b72..803ae7e07c6 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -4,10 +4,10 @@ import {
   GitPullRequestClosedIcon,
   GitPullRequestDraftIcon,
   IssueClosedIcon,
-  QuestionIcon,
   SkipIcon,
   IssueDraftIcon,
   IssueOpenedIcon,
+  QuestionIcon,
   GitMergeQueueIcon,
   AlertIcon,
 } from '@primer/octicons-react'

From af3dc9c0057b4d3a34e6389abc12cdc8275f914a Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 18:08:57 +0200
Subject: [PATCH 07/12] run lint locally (sigh)

---
 packages/react/src/StateLabel/StateLabel.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 803ae7e07c6..472aaef8b2b 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -133,7 +133,14 @@ function StateLabel({children, status, variant: variantProp = 'normal', ...rest}
   return (
     <StateLabelBase {...rest} variant={variantProp} status={status}>
       {/* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */}
-      {status && <Octicon {...octiconProps} icon={octiconMap[status] || QuestionIcon} aria-label={labelMap[status]} sx={{mr: 1}} />}
+      {status && (
+        <Octicon
+          {...octiconProps}
+          icon={octiconMap[status] || QuestionIcon}
+          aria-label={labelMap[status]}
+          sx={{mr: 1}}
+        />
+      )}
       {children}
     </StateLabelBase>
   )

From 7b43541fd12c3eaf7a0fddd16db33411aff8bc46 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 18:10:26 +0200
Subject: [PATCH 08/12] Create wild-actors-jam.md

---
 .changeset/wild-actors-jam.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/wild-actors-jam.md

diff --git a/.changeset/wild-actors-jam.md b/.changeset/wild-actors-jam.md
new file mode 100644
index 00000000000..b3da43da561
--- /dev/null
+++ b/.changeset/wild-actors-jam.md
@@ -0,0 +1,5 @@
+---
+"@primer/react": patch
+---
+
+StateLabel: Differentiate issue and pull request labels for screen readers

From 2fae51521791627a0bbe4c7b1f5b3c2ac4e4d29e Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Mon, 22 Jul 2024 18:18:46 +0200
Subject: [PATCH 09/12] bring back eslint-disable-line

---
 packages/react/src/StateLabel/StateLabel.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 472aaef8b2b..37c4ce8799f 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -136,6 +136,7 @@ function StateLabel({children, status, variant: variantProp = 'normal', ...rest}
       {status && (
         <Octicon
           {...octiconProps}
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
           icon={octiconMap[status] || QuestionIcon}
           aria-label={labelMap[status]}
           sx={{mr: 1}}

From a79a202a72fe32dd2ebf92e1e78eb2d40e79a9d8 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Wed, 24 Jul 2024 15:10:05 +0200
Subject: [PATCH 10/12] add not planned for issueClosedNotPlanned

---
 packages/react/src/StateLabel/StateLabel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 37c4ce8799f..87fad78813f 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -37,7 +37,7 @@ const labelMap: Record<keyof typeof octiconMap, 'Issue' | 'Pull request' | ''> =
   issueOpened: 'Issue',
   pullOpened: 'Pull request',
   issueClosed: 'Issue',
-  issueClosedNotPlanned: 'Issue',
+  issueClosedNotPlanned: 'Issue, not planned',
   pullClosed: 'Pull request',
   pullMerged: 'Pull request',
   draft: 'Pull request',

From 0df55cd58e94cd6c9c2114b77fbf438b40e873c3 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Wed, 24 Jul 2024 15:17:32 +0200
Subject: [PATCH 11/12] have to add an awkward member to the types

---
 packages/react/src/StateLabel/StateLabel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/StateLabel.tsx b/packages/react/src/StateLabel/StateLabel.tsx
index 87fad78813f..8df7ea42b5a 100644
--- a/packages/react/src/StateLabel/StateLabel.tsx
+++ b/packages/react/src/StateLabel/StateLabel.tsx
@@ -33,7 +33,7 @@ const octiconMap = {
   unavailable: AlertIcon,
 }
 
-const labelMap: Record<keyof typeof octiconMap, 'Issue' | 'Pull request' | ''> = {
+const labelMap: Record<keyof typeof octiconMap, 'Issue' | 'Issue, not planned' | 'Pull request' | ''> = {
   issueOpened: 'Issue',
   pullOpened: 'Pull request',
   issueClosed: 'Issue',

From e7a3e29dc49e3bd2f9c2d9c06e986d2fbd5d0bf4 Mon Sep 17 00:00:00 2001
From: Siddharth Kshetrapal <siddharthkp@github.com>
Date: Wed, 24 Jul 2024 15:18:16 +0200
Subject: [PATCH 12/12] update snapshots

---
 .../StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap b/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
index 9fa743d45f8..d067b48e570 100644
--- a/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
+++ b/packages/react/src/StateLabel/__tests__/__snapshots__/StateLabel.test.tsx.snap
@@ -210,7 +210,7 @@ exports[`StateLabel respects the status prop 3`] = `
   className="c0"
 >
   <svg
-    aria-label="Issue"
+    aria-label="Issue, not planned"
     className="c1"
     fill="currentColor"
     focusable="false"