diff --git a/_rules/focusable-no-keyboard-trap-80af7b.md b/_rules/focusable-no-keyboard-trap-80af7b.md
index aa36a14d350..24c74066c35 100755
--- a/_rules/focusable-no-keyboard-trap-80af7b.md
+++ b/_rules/focusable-no-keyboard-trap-80af7b.md
@@ -35,9 +35,7 @@ acknowledgments:
## Applicability
-This rule only applies to any [HTML or SVG element][] that is [focusable][].
-
-**Note:** This rule only applies to HTML and SVG. Thus, it is a partial check for WCAG 2.0 success criterion 2.1.2, which applies to all content.
+This rule applies to any [HTML or SVG element][] that is [focusable][].
## Expectation
@@ -68,7 +66,7 @@ _There are no major accessibility support issues known for this rule._
#### Passed Example 1
-No trap for keyboard navigation.
+These [focusable][] elements do not create a trap for keyboard navigation.
```html
Link 1 Button1
@@ -76,7 +74,7 @@ No trap for keyboard navigation.
#### Passed Example 2
-Using `tabindex="1"`.
+This element is made [focusable][] by the `tabindex` attribute. It does not create a trap for keyboard navigation.
```html
Text
@@ -84,7 +82,7 @@ Using `tabindex="1"`.
#### Passed Example 3
-Using `tabindex="-1"`.
+This element is made [focusable][] by the `tabindex` attribute, even if it is not part of the sequential focus navigation. It does not create a trap for keyboard navigation.
```html
Text
@@ -92,23 +90,17 @@ Using `tabindex="-1"`.
#### Passed Example 4
-Keyboard trap with help information in a paragraph before, and where the method advised works.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information in a paragraph before the `button` elements and the method advised works to escape the keyboard trap.
```html
-
+
-Press the M-key to Exit
+Press Ctrl+M to Exit
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -116,23 +108,17 @@ Keyboard trap with help information in a paragraph before, and where the method
#### Passed Example 5
-Keyboard trap with help information within the trap, and where the method advised works.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information within the trap and the method advised works to escape the keyboard trap.
```html
-
+
Link 1
-
+
Button 1
-Press the M-key to Exit
-
+Press Ctrl+M to Exit
+
Button 2
Link 2
@@ -140,25 +126,19 @@ Keyboard trap with help information within the trap, and where the method advise
#### Passed Example 6
-Keyboard trap with "help" link that once clicked exposes the instructions.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information in a "help" link that once clicked exposes the instructions to escape the keyboard trap.
```html
-
+
-
+
@@ -169,7 +149,7 @@ Keyboard trap with "help" link that once clicked exposes the instructions.
#### Failed Example 1
-Keyboard trap one element.
+This [focusable][] element creates a keyboard trap bringing focus to the `button`.
```html
Link 1
@@ -180,7 +160,7 @@ Keyboard trap one element.
#### Failed Example 2
-Keyboard trap group.
+These [focusable][] `button` elements create a keyboard trap preventing the last `button` to be reached using the keyboard.
```html
@@ -196,7 +176,7 @@ Keyboard trap group.
#### Failed Example 3
-A [focusable][] element between keyboard traps.
+This `button` element is between other `button` elements creating a keyboard trap.
```html
Button 1
@@ -206,22 +186,16 @@ A [focusable][] element between keyboard traps.
#### Failed Example 4
-Keyboard trap with no instructions.
+These focusable `button` elements create a keyboard trap with no instructions.
```html
-
+
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -229,23 +203,17 @@ Keyboard trap with no instructions.
#### Failed Example 5
-Keyboard trap with instructions that doesn't give advise on the method for proceeding.
+These focusable `button` elements create a keyboard trap with instructions that don't give advice on the method for proceeding.
```html
-
+
Go to the next element
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -253,19 +221,17 @@ Keyboard trap with instructions that doesn't give advise on the method for proce
#### Failed Example 6
-Keyboard trap with help text, where the method advised doesn't work.
+These focusable `button` elements create a keyboard trap with help text, where the method advised doesn't work.
```html
-
+
Link 1
-
+
Button 1
-Press the M-key to Exit
-
+Press Ctrl+M to Exit
+
Button 2
Link 2
@@ -275,7 +241,7 @@ Keyboard trap with help text, where the method advised doesn't work.
#### Inapplicable Example 1
-No [focusable][] element.
+There is no [focusable][] element.
```html
Page 1
@@ -283,7 +249,7 @@ No [focusable][] element.
#### Inapplicable Example 2
-Disabled element.
+There is no [focusable][] element.
```html
Click Me!
@@ -291,7 +257,7 @@ Disabled element.
#### Inapplicable Example 3
-Hidden element using `display:none`.
+There is no [focusable][] element.
```html
Click Me!
@@ -299,7 +265,7 @@ Hidden element using `display:none`.
#### Inapplicable Example 4
-Hidden element using `visibility:hidden`.
+There is no [focusable][] element.
```html
Link 1 Button1
diff --git a/_rules/focusable-no-keyboard-trap-non-standard-nav-ebe86a.md b/_rules/focusable-no-keyboard-trap-non-standard-nav-ebe86a.md
index f48fcb78676..e4895fedc87 100755
--- a/_rules/focusable-no-keyboard-trap-non-standard-nav-ebe86a.md
+++ b/_rules/focusable-no-keyboard-trap-non-standard-nav-ebe86a.md
@@ -25,8 +25,6 @@ acknowledgments:
This rule applies to any [HTML or SVG element][] that is [focusable](#focusable) where focus cannot cycle to the browser UI by using [standard keyboard navigation](#standard-keyboard-navigation).
-**Note:** This rule only applies to HTML and SVG. Thus, it is a partial check for WCAG 2.0 success criterion 2.1.2, which applies to all content.
-
## Expectation 1
For each target element help information is [visible](#visible) and [included in the accessibility tree](#included-in-the-accessibility-tree) or can be accessed from within the keyboard trap.
@@ -66,23 +64,17 @@ There are no major accessibility support issues known for this rule.
#### Passed Example 1
-Keyboard trap with help information in a paragraph before, and where the method advised works.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information in a paragraph before the `button` elements and the method advised works to escape the keyboard trap.
```html
-
+
-Press the M-key to Exit
+Press Ctrl+M to Exit
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -90,23 +82,17 @@ Keyboard trap with help information in a paragraph before, and where the method
#### Passed Example 2
-Keyboard trap with help information within the trap, and where the method advised works.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information within the trap and the method advised works to escape the keyboard trap.
```html
-
+
Link 1
-
+
Button 1
-Press the M-key to Exit
-
+Press Ctrl+M to Exit
+
Button 2
Link 2
@@ -114,25 +100,19 @@ Keyboard trap with help information within the trap, and where the method advise
#### Passed Example 3
-Keyboard trap with "help" link that once clicked exposes the instructions.
+These focusable `button` elements have scripts that create a keyboard trap. The document includes help information in a "help" link that once clicked exposes the instructions to escape the keyboard trap.
```html
-
+
-
+
@@ -143,22 +123,16 @@ Keyboard trap with "help" link that once clicked exposes the instructions.
#### Failed Example 1
-Keyboard trap with no instructions.
+These focusable `button` elements create a keyboard trap with no instructions.
```html
-
+
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -166,23 +140,17 @@ Keyboard trap with no instructions.
#### Failed Example 2
-Keyboard trap with instructions that doesn't give advise on the method for proceeding.
+These focusable `button` elements create a keyboard trap with instructions that don't give advice on the method for proceeding.
```html
-
+
Go to the next element
Link 1
-
+
Button 1
-
+
Button 2
Link 2
@@ -190,19 +158,17 @@ Keyboard trap with instructions that doesn't give advise on the method for proce
#### Failed Example 3
-Keyboard trap with help text, where the method advised doesn't work.
+These focusable `button` elements create a keyboard trap with help text, where the method advised doesn't work.
```html
-
+
Link 1
-
+
Button 1
-Press the M-key to Exit
-
+Press Ctrl+M to Exit
+
Button 2
Link 2
@@ -212,7 +178,7 @@ Keyboard trap with help text, where the method advised doesn't work.
#### Inapplicable Example 1
-Not a keyboard trap (interactive element).
+This focusable `button` elements do not create a keyboard trap.
```html
Link 1
diff --git a/_rules/focusable-no-keyboard-trap-standard-nav-a1b64e.md b/_rules/focusable-no-keyboard-trap-standard-nav-a1b64e.md
index ee5f52f92e5..7bee6e6c4b2 100755
--- a/_rules/focusable-no-keyboard-trap-standard-nav-a1b64e.md
+++ b/_rules/focusable-no-keyboard-trap-standard-nav-a1b64e.md
@@ -25,11 +25,9 @@ acknowledgments:
This rule applies to any [HTML or SVG element][] that is [focusable][].
-**Note:** This rule only applies to HTML and SVG. Thus, it is a partial check for WCAG 2.0 success criterion 2.1.2, which applies to all content.
-
## Expectation
-For each target element focus can cycle to the browser UI by using [standard keyboard navigation](#standard-keyboard-navigation).
+For each target element, focus can cycle to the browser UI by using [standard keyboard navigation](#standard-keyboard-navigation).
**Note:** Cycling back to the browser UI can be done both by moving forward through the tab order and by moving backwards. It is not possible to fulfill this expectation by using browser specific shortcuts to return to the browser UI.
@@ -56,7 +54,7 @@ There are no major accessibility support issues known for this rule.
#### Passed Example 1
-No trap for keyboard navigation.
+These [focusable][] elements do not create a trap for keyboard navigation.
```html
Link 1 Button1
@@ -64,7 +62,7 @@ No trap for keyboard navigation.
#### Passed Example 2
-Using `tabindex="1"`.
+This element is made [focusable][] by the `tabindex` attribute. It does not create a trap for keyboard navigation.
```html
Text
@@ -72,7 +70,7 @@ Using `tabindex="1"`.
#### Passed Example 3
-Using `tabindex="-1"`.
+This element is made [focusable][] by the `tabindex` attribute, even if it is not part of the sequential focus navigation. It does not create a trap for keyboard navigation.
```html
Text
@@ -82,7 +80,7 @@ Using `tabindex="-1"`.
#### Failed Example 1
-Keyboard trap one element.
+This [focusable][] element creates a keyboard trap bringing focus to the `button`.
```html
Link 1
@@ -93,7 +91,7 @@ Keyboard trap one element.
#### Failed Example 2
-Keyboard trap group.
+These [focusable][] `button` elements create a keyboard trap preventing the last `button` to be reached using the keyboard.
```html
@@ -109,7 +107,7 @@ Keyboard trap group.
#### Failed Example 3
-A [focusable][] element between keyboard traps.
+This `button` element is between other `button` elements creating keyboard traps.
```html
Button 1
@@ -121,7 +119,7 @@ A [focusable][] element between keyboard traps.
#### Inapplicable Example 1
-No [focusable][] element.
+There is no [focusable][] element.
```html
Page 1
@@ -129,7 +127,7 @@ No [focusable][] element.
#### Inapplicable Example 2
-Disabled element.
+There is no [focusable][] element.
```html
Click Me!
@@ -137,7 +135,7 @@ Disabled element.
#### Inapplicable Example 3
-Hidden element using `display:none`.
+There is no [focusable][] element.
```html
Click Me!
@@ -145,7 +143,7 @@ Hidden element using `display:none`.
#### Inapplicable Example 4
-Hidden element using `visibility:hidden`.
+There is no [focusable][] element.
```html
Link 1 Button1
diff --git a/test-assets/focusable-no-keyboard-trap/keyboard.js b/test-assets/focusable-no-keyboard-trap/keyboard.js
new file mode 100644
index 00000000000..8d014c35599
--- /dev/null
+++ b/test-assets/focusable-no-keyboard-trap/keyboard.js
@@ -0,0 +1,24 @@
+var trapOn = false
+
+function moveFocusToButton(btn) {
+ if (trapOn) {
+ document.getElementById(btn).focus()
+ }
+}
+
+function escapeTrapOnCtrlM(e) {
+ if (e.keyCode === 77 && e.ctrlKey) {
+ trapOn = false
+ document.getElementById('link2').focus()
+ }
+}
+
+function moveFocusTo(elm) {
+ if (trapOn) {
+ document.getElementById(elm).focus()
+ }
+}
+
+function showHelpText() {
+ document.getElementById('helptext').innerHTML = 'Press Ctrl+M to Exit
'
+}