From 2a549ff3ae4be6cec4b295b47a7534d9d07c0ea7 Mon Sep 17 00:00:00 2001
From: Jon Gunderson <jongund@illinois.edu>
Date: Wed, 20 Nov 2019 10:16:54 -0700
Subject: [PATCH 1/5] added guidance for using tabindex on a tabpanel

---
 aria-practices.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/aria-practices.html b/aria-practices.html
index 94add28540..06fdad02df 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -1024,7 +1024,7 @@ <h4>WAI-ARIA Roles, States, and Properties</h4>
           <li>The element that serves as an input and displays the combobox value has role <a href="#combobox" class="role-reference">combobox</a>.</li>
           <li>
             The combobox element has <a href="#aria-controls" class="property-reference">aria-controls</a> set to a value that refers to the element that serves as the popup.
-            Note that <code>aria-controls</code> only needs to be set when the popup is visible. However, it is valid to reference an element that is not visible. 
+            Note that <code>aria-controls</code> only needs to be set when the popup is visible. However, it is valid to reference an element that is not visible.
           </li>
           <li>The popup is an element that has role <a href="#listbox" class="role-reference">listbox</a>, <a href="#tree" class="role-reference">tree</a>, <a href="#grid" class="role-reference">grid</a>, or <a href="#dialog" class="role-reference">dialog</a>.</li>
           <li>
@@ -2632,8 +2632,12 @@ <h4>Keyboard Interaction</h4>
         <p>For the tab list:</p>
         <ul>
           <li>
-            <kbd>Tab</kbd>: When focus moves into the tab list, places focus on the active <code>tab</code> element.
-            When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.
+            <kbd>Tab</kbd>:
+            <ul>
+              <li>When focus moves into the tab list, places focus on the active <code>tab</code> element.</li>
+              <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.</li>
+              <li>When the first element contained within a <code>tabpanel</code> element is not focusable, it should set <code>tabindex="0"</code> to make it part of the tab sequence.</li>
+            </ul>
           </li>
           <li>When focus is on a tab element in a horizontal tab list:
             <ul>

From 687d45502aa66f12e2d4d840c0ed8f3abbb591a5 Mon Sep 17 00:00:00 2001
From: Jon Gunderson <jongund@illinois.edu>
Date: Wed, 20 Nov 2019 10:28:03 -0700
Subject: [PATCH 2/5] editorial change to tabindex on tabpanel

---
 aria-practices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aria-practices.html b/aria-practices.html
index 06fdad02df..ff31455c5e 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -2636,7 +2636,7 @@ <h4>Keyboard Interaction</h4>
             <ul>
               <li>When focus moves into the tab list, places focus on the active <code>tab</code> element.</li>
               <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.</li>
-              <li>When the first element contained within a <code>tabpanel</code> element is not focusable, it should set <code>tabindex="0"</code> to make it part of the tab sequence.</li>
+              <li>When the first element contained within a <code>tabpanel</code> element is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
             </ul>
           </li>
           <li>When focus is on a tab element in a horizontal tab list:

From 7d977e68798e21e3c495206911573ccdabf5d479 Mon Sep 17 00:00:00 2001
From: Jon Gunderson <jongund@illinois.edu>
Date: Wed, 20 Nov 2019 10:30:00 -0700
Subject: [PATCH 3/5] editorial change to tabindex on tabpanel

---
 aria-practices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aria-practices.html b/aria-practices.html
index ff31455c5e..7ffa5f6cb4 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -2636,7 +2636,7 @@ <h4>Keyboard Interaction</h4>
             <ul>
               <li>When focus moves into the tab list, places focus on the active <code>tab</code> element.</li>
               <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.</li>
-              <li>When the first element contained within a <code>tabpanel</code> element is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
+              <li>When the first element contained within a tab panel element is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
             </ul>
           </li>
           <li>When focus is on a tab element in a horizontal tab list:

From f504bdf11088d3c85ab6a2651925787e6739cc4f Mon Sep 17 00:00:00 2001
From: Jon Gunderson <jongund@illinois.edu>
Date: Wed, 20 Nov 2019 10:31:49 -0700
Subject: [PATCH 4/5] editorial change to tabindex on tabpanel

---
 aria-practices.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aria-practices.html b/aria-practices.html
index 7ffa5f6cb4..53c6e1dde2 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -2636,7 +2636,7 @@ <h4>Keyboard Interaction</h4>
             <ul>
               <li>When focus moves into the tab list, places focus on the active <code>tab</code> element.</li>
               <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.</li>
-              <li>When the first element contained within a tab panel element is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
+              <li>When the first element within a tab panel is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
             </ul>
           </li>
           <li>When focus is on a tab element in a horizontal tab list:

From 1df1b5e2100f6c43370f3736dfe21f6bb86aa1e7 Mon Sep 17 00:00:00 2001
From: Jon <jongund@illinois.edu>
Date: Tue, 10 Dec 2019 14:19:50 -0600
Subject: [PATCH 5/5] made edit to guiidance based on Matt's suggestion in
 teleconference today

---
 aria-practices.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aria-practices.html b/aria-practices.html
index 53c6e1dde2..7ff52929f3 100644
--- a/aria-practices.html
+++ b/aria-practices.html
@@ -2635,8 +2635,7 @@ <h4>Keyboard Interaction</h4>
             <kbd>Tab</kbd>:
             <ul>
               <li>When focus moves into the tab list, places focus on the active <code>tab</code> element.</li>
-              <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is typically either the first focusable element inside the tab panel or the tab panel itself.</li>
-              <li>When the first element within a tab panel is not focusable, the <code>tabpanel</code> element should have <code>tabindex="0"</code> to make it part of the tab sequence.</li>
+              <li>When the tab list contains the focus, moves focus to the next element in the page tab sequence outside the tablist, which is the tabpanel unless the first element containing meaningful content inside the tabpanel is focusable.</li>
             </ul>
           </li>
           <li>When focus is on a tab element in a horizontal tab list: