From 6598114cb8f557a8550b47727b990ce256c09829 Mon Sep 17 00:00:00 2001
From: gwyneplaine <cc.lee@live.com.au>
Date: Thu, 26 Aug 2021 13:47:50 +1000
Subject: [PATCH 1/2] merge aria-description text into aria-label

---
 .../admin-ui/pages/ListPage/FieldSelection.tsx              | 3 +--
 .../admin-ui/pages/ListPage/FilterAdd.tsx                   | 3 +--
 .../admin-ui/pages/ListPage/FilterList.tsx                  | 6 ++----
 .../admin-ui/pages/ListPage/SortSelection.tsx               | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
index f6bef6d06fd..1b21e3d3a43 100644
--- a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
+++ b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FieldSelection.tsx
@@ -71,8 +71,7 @@ export function FieldSelection({
 
   return (
     <Popover
-      aria-label="Columns options"
-      aria-description={`list of column options to apply to the ${list.key} list`}
+      aria-label={`Columns options, list of column options to apply to the ${list.key} list`}
       triggerRenderer={({ triggerProps }) => {
         return (
           <Button weight="link" css={{ padding: 4 }} {...triggerProps}>
diff --git a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
index 41f68ff028a..172ed76ab13 100644
--- a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
+++ b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterAdd.tsx
@@ -75,8 +75,7 @@ export function FilterAdd({ listKey }: { listKey: string }) {
         <ChevronDownIcon size="small" />
       </Button>
       <PopoverDialog
-        aria-label="Filters options"
-        aria-description={`list of filters to apply to the ${listKey} list`}
+        aria-label={`Filters options, list of filters to apply to the ${listKey} list`}
         arrow={arrow}
         isVisible={isOpen}
         {...dialog.props}
diff --git a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterList.tsx b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterList.tsx
index 7b487926842..4e8aed9c879 100644
--- a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterList.tsx
+++ b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/FilterList.tsx
@@ -43,9 +43,8 @@ function FilterPill({ filter, field }: { filter: Filter; field: FieldMeta }) {
     <Fragment>
       <Pill
         containerProps={{
-          'aria-label': `Filter item ${filter.field}`,
+          'aria-label': `Filter item ${filter.field}, press to edit filter`,
         }}
-        aria-description={'Press to edit filter'}
         {...trigger.props}
         ref={trigger.ref}
         onClick={() => setOpen(true)}
@@ -64,8 +63,7 @@ function FilterPill({ filter, field }: { filter: Filter; field: FieldMeta }) {
         />
       </Pill>
       <PopoverDialog
-        aria-label="filter item config"
-        aria-description={`dialog for configuring ${filter.field} filter`}
+        aria-label={`filter item config, dialog for configuring ${filter.field} filter`}
         arrow={arrow}
         {...dialog.props}
         isVisible={isOpen}
diff --git a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/SortSelection.tsx b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/SortSelection.tsx
index 5470704712b..77220517b0c 100644
--- a/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/SortSelection.tsx
+++ b/packages/keystone/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage/SortSelection.tsx
@@ -44,8 +44,7 @@ export function SortSelection({ list }: { list: ListMeta }) {
       </Button>
 
       <PopoverDialog
-        aria-label="Sort options"
-        aria-description={`list of sorting parameters to apply to the ${list.key} list`}
+        aria-label={`Sort options, list of sorting parameters to apply to the ${list.key} list`}
         arrow={arrow}
         isVisible={isOpen}
         {...dialog.props}

From a6c7a5af4972a45884c64d46b3b2fb2785f56d7b Mon Sep 17 00:00:00 2001
From: gwyneplaine <cc.lee@live.com.au>
Date: Thu, 26 Aug 2021 14:00:31 +1000
Subject: [PATCH 2/2] chnageset

---
 .changeset/spotty-ducks-wonder.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/spotty-ducks-wonder.md

diff --git a/.changeset/spotty-ducks-wonder.md b/.changeset/spotty-ducks-wonder.md
new file mode 100644
index 00000000000..ba3da56de08
--- /dev/null
+++ b/.changeset/spotty-ducks-wonder.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Merged aria-description text for dialogs on list view in Admin UI into their respective aria-labels.