diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
index 761887a16de..a224319a80f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@
 
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 
 import static com.sun.javafx.PlatformUtil.*;
 import com.sun.javafx.scene.NodeHelper;
@@ -170,7 +171,7 @@ public DatePickerContent(final DatePicker datePicker) {
                 if (newFocusOwner == gridPane) {
                     if (oldFocusOwner instanceof DateCell) {
                         // Backwards traversal, skip gridPane.
-                        NodeHelper.traverse(gridPane, Direction.PREVIOUS);
+                        NodeHelper.traverse(gridPane, Direction.PREVIOUS, TraversalMethod.DEFAULT);
                     } else {
                         // Forwards traversal, pass focus to day cell.
                         if (lastFocusedDayCell != null) {
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
index e485c83e539..95898b157be 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -178,8 +178,7 @@ protected void keyReleased(KeyEvent e) {
      * potentially arming the Button, this will transfer focus to the button
      */
     protected void mousePressed(MouseEvent e) {
-        // if the button is not already focused, then request the focus
-        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+        if (getNode().isFocusTraversable()) {
             getNode().requestFocus();
         }
 
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
index 0ea6bc8907c..afbf06136b3 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.event.EventTarget;
 import javafx.scene.Node;
 import com.sun.javafx.scene.control.inputmap.InputMap;
@@ -86,13 +87,14 @@ public static <N extends Node> InputMap<N> createInputMap(N node) {
      *
      * @param node The node to traverse on
      * @param dir The direction to traverse
+     * @param method The focus traversal method
      */
-    public static void traverse(final Node node, final Direction dir) {
+    public static void traverse(final Node node, final Direction dir, TraversalMethod method) {
         if (node == null) {
             throw new IllegalArgumentException("Attempting to traverse on a null Node. " +
                     "Most probably a KeyEvent has been fired with a null target specified.");
         }
-        NodeHelper.traverse(node, dir);
+        NodeHelper.traverse(node, dir, method);
     }
 
     /**
@@ -100,7 +102,7 @@ public static void traverse(final Node node, final Direction dir) {
      * go the next focusTraversable Node above the current one.
      */
     public static final void traverseUp(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.UP);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
     }
 
     /**
@@ -108,7 +110,7 @@ public static final void traverseUp(KeyEvent e) {
      * go the next focusTraversable Node below the current one.
      */
     public static final void traverseDown(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.DOWN);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
     }
 
     /**
@@ -116,7 +118,7 @@ public static final void traverseDown(KeyEvent e) {
      * go the next focusTraversable Node left of the current one.
      */
     public static final void traverseLeft(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.LEFT);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
     }
 
     /**
@@ -124,7 +126,7 @@ public static final void traverseLeft(KeyEvent e) {
      * go the next focusTraversable Node right of the current one.
      */
     public static final void traverseRight(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.RIGHT);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
     }
 
     /**
@@ -132,7 +134,7 @@ public static final void traverseRight(KeyEvent e) {
      * go the next focusTraversable Node in the focus traversal cycle.
      */
     public static final void traverseNext(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.NEXT);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
     }
 
     /**
@@ -140,7 +142,7 @@ public static final void traverseNext(KeyEvent e) {
      * go the previous focusTraversable Node in the focus traversal cycle.
      */
     public static final void traversePrevious(KeyEvent e) {
-        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
     }
 
     private static Node getNode(KeyEvent e) {
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
index 3d0ea3087fc..45ecc5a763f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,8 +109,7 @@ public void trackPress(MouseEvent e, double position) {
         // determine the percentage of the way between min and max
         // represented by this mouse event
         final Slider slider = getNode();
-        // If not already focused, request focus
-        if (!slider.isFocused()) slider.requestFocus();
+        slider.requestFocus();
         if (slider.getOrientation().equals(Orientation.HORIZONTAL)) {
             slider.adjustValue(position * (slider.getMax() - slider.getMin()) + slider.getMin());
         } else {
@@ -123,9 +122,8 @@ public void trackPress(MouseEvent e, double position) {
       *       track and 1.0 being the end
      */
     public void thumbPressed(MouseEvent e, double position) {
-        // If not already focused, request focus
         final Slider slider = getNode();
-        if (!slider.isFocused())  slider.requestFocus();
+        slider.requestFocus();
         slider.setValueChanging(true);
     }
 
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
index 89fa52b46f7..d84b9141cbd 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.css.PseudoClass;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
@@ -104,27 +105,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
index fa489275156..11def1aaa90 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 
 import javafx.scene.Scene;
@@ -84,27 +85,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
index 50c106a6dce..7ba7b82cf1f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 
@@ -86,27 +87,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
index 8b1b599036b..aae8c731a72 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 import javafx.scene.control.PopupControl;
 
@@ -105,27 +106,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
@@ -165,26 +166,26 @@ public void dispose() {
                           break;
                       case LEFT :
                           if (obj instanceof Node) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                               event.consume();
                           }
                           else if (obj instanceof Scene) {
                               Node node = ((Scene)obj).getFocusOwner();
                               if (node != null) {
-                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.LEFT);
+                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                                   event.consume();
                               }
                           }
                           break;
                       case RIGHT :
                           if (obj instanceof Node) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                               event.consume();
                           }
                           else if (obj instanceof Scene) {
                               Node node = ((Scene)obj).getFocusOwner();
                               if (node != null) {
-                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                                   event.consume();
                               }
                           }
diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index d6fd0d75a98..77fa51a7425 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -2,7 +2,7 @@
 
 <!--
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1778,6 +1778,14 @@ <h4>Pseudo-classes</h4>
           <td>applies when the <strong>focused</strong> variable is true</td>
         </tr>
         <tr>
+        <th class="propertyname" scope="row">focus-visible</th>
+          <td>applies when the <strong>focusVisible</strong> variable is true</td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">focus-within</th>
+          <td>applies when the <strong>focusWithin</strong> variable is true</td>
+        </tr>
+        <tr>
         <th class="propertyname" scope="row">hover</th>
           <td>applies when the <strong>hover</strong> variable is true</td>
         </tr>
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
index edaf393862c..6bb27e08983 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.event.Event;
@@ -99,7 +100,7 @@ public ObservableMap<KeyCombination, Runnable> getAccelerators() {
     }
 
     private void traverse(Event event, Node node, Direction dir) {
-        if (NodeHelper.traverse(node, dir)) {
+        if (NodeHelper.traverse(node, dir, TraversalMethod.KEY)) {
             event.consume();
         }
     }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
index dec9c54e3ec..e6a6dfddabb 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.scene.input.PickResultChooser;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.javafx.util.Utils;
 import java.util.List;
@@ -233,8 +234,8 @@ public static BooleanProperty showMnemonicsProperty(Node node) {
         return nodeAccessor.showMnemonicsProperty(node);
     }
 
-    public static boolean traverse(Node node, Direction direction) {
-        return nodeAccessor.traverse(node, direction);
+    public static boolean traverse(Node node, Direction direction, TraversalMethod method) {
+        return nodeAccessor.traverse(node, direction, method);
     }
 
     public static double getPivotX(Node node) {
@@ -307,6 +308,10 @@ public static Map<StyleableProperty<?>,List<Style>> findStyles(Node node, Map<St
         return nodeAccessor.findStyles(node, styleMap);
     }
 
+    public static void requestFocusVisible(Node node) {
+        nodeAccessor.requestFocusVisible(node);
+    }
+
     public static void setNodeAccessor(final NodeAccessor newAccessor) {
         if (nodeAccessor != null) {
             throw new IllegalStateException();
@@ -346,7 +351,7 @@ boolean doComputeIntersects(Node node, PickRay pickRay,
         void setShowMnemonics(Node node, boolean value);
         boolean isShowMnemonics(Node node);
         BooleanProperty showMnemonicsProperty(Node node);
-        boolean traverse(Node node, Direction direction);
+        boolean traverse(Node node, Direction direction, TraversalMethod method);
         double getPivotX(Node node);
         double getPivotY(Node node);
         double getPivotZ(Node node);
@@ -366,6 +371,7 @@ boolean doComputeIntersects(Node node, PickRay pickRay,
         List<Style> getMatchingStyles(CssMetaData cssMetaData, Styleable styleable);
         Map<StyleableProperty<?>,List<Style>> findStyles(Node node,
                 Map<StyleableProperty<?>,List<Style>> styleMap);
+        void requestFocusVisible(Node node);
     }
 
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
index 431d41f53b1..9d3b6d3f538 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.scene.traversal;
 
+import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.ParentHelper;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -64,9 +65,10 @@ protected TopMostTraversalEngine() {
      *
      * @param node The starting node to traverse from
      * @param dir the traversal direction
+     * @param method the traversal method
      * @return the new focus owner or null if none found (in that case old focus owner is still valid)
      */
-    public final Node trav(Node node, Direction dir) {
+    public final Node trav(Node node, Direction dir, TraversalMethod method) {
         Node newNode = null;
         Parent p = node.getParent();
         Node traverseNode = node;
@@ -101,13 +103,18 @@ public final Node trav(Node node, Direction dir) {
             }
         }
         if (newNode != null) {
-            focusAndNotify(newNode);
+            focusAndNotify(newNode, method);
         }
         return newNode;
     }
 
-    private void focusAndNotify(Node newNode) {
-        newNode.requestFocus();
+    private void focusAndNotify(Node newNode, TraversalMethod method) {
+        if (method == TraversalMethod.KEY) {
+            NodeHelper.requestFocusVisible(newNode);
+        } else {
+            newNode.requestFocus();
+        }
+
         notifyTreeTraversedTo(newNode);
     }
 
@@ -129,7 +136,7 @@ private void notifyTreeTraversedTo(Node newNode) {
      */
     public final Node traverseToFirst() {
         Node n = selectFirst();
-        if (n != null) focusAndNotify(n);
+        if (n != null) focusAndNotify(n, TraversalMethod.DEFAULT);
         return n;
     }
 
@@ -139,7 +146,7 @@ public final Node traverseToFirst() {
      */
     public final Node traverseToLast() {
         Node n = selectLast();
-        if (n != null) focusAndNotify(n);
+        if (n != null) focusAndNotify(n, TraversalMethod.DEFAULT);
         return n;
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
new file mode 100644
index 00000000000..d00f12a6d48
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.scene.traversal;
+
+/**
+ * Specifies the traversal method.
+ */
+public enum TraversalMethod {
+    /**
+     * Traversal was initiated programmatically or by clicking.
+     */
+    DEFAULT,
+
+    /**
+     * Traversal was initiated by pressing a key on the keyboard.
+     */
+    KEY
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 588e106fda1..c25e0df571b 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 
 import com.sun.javafx.geometry.BoundsUtils;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -522,8 +523,8 @@ public BooleanProperty showMnemonicsProperty(Node node) {
             }
 
             @Override
-            public boolean traverse(Node node, Direction direction) {
-                return node.traverse(direction);
+            public boolean traverse(Node node, Direction direction, TraversalMethod method) {
+                return node.traverse(direction, method);
             }
 
             @Override
@@ -619,6 +620,11 @@ public Map<StyleableProperty<?>, List<Style>> findStyles(Node node,
                     Map<StyleableProperty<?>, List<Style>> styleMap) {
                 return node.findStyles(styleMap);
             }
+
+            @Override
+            public void requestFocusVisible(Node node) {
+                node.requestFocusVisible();
+            }
         });
     }
 
@@ -951,6 +957,7 @@ private ReadOnlyObjectWrapper<Parent> parentPropertyImpl() {
                 @Override
                 protected void invalidated() {
                     if (oldParent != null) {
+                        updateRemovedParentFocus(oldParent);
                         oldParent.disabledProperty().removeListener(parentDisabledChangedListener);
                         oldParent.treeVisibleProperty().removeListener(parentTreeVisibleChangedListener);
                         if (nodeTransformation != null && nodeTransformation.listenerReasons > 0) {
@@ -8112,55 +8119,85 @@ public final ObjectProperty<InputMethodRequests> inputMethodRequestsProperty() {
      * like an atomic operation - when the old node is notified to loose focus,
      * the new node is already focused.
      */
-    final class FocusedProperty extends ReadOnlyBooleanPropertyBase {
+    abstract class FocusPropertyBase extends ReadOnlyBooleanPropertyBase {
         private boolean value;
-        private boolean valid = true;
-        private boolean needsChangeEvent = false;
+        private boolean lastNotifiedValue;
 
-        public void store(final boolean value) {
-            if (value != this.value) {
-                this.value = value;
-                markInvalid();
-            }
+        protected abstract PseudoClass getPseudoClass();
+
+        @Override
+        public Object getBean() {
+            return Node.this;
         }
 
-        public void notifyListeners() {
-            if (needsChangeEvent) {
-                fireValueChangedEvent();
-                needsChangeEvent = false;
-            }
+        @Override
+        public boolean get() {
+            return value;
         }
 
-        private void markInvalid() {
-            if (valid) {
-                valid = false;
+        public void set(boolean value) {
+            this.value = value;
+        }
 
-                pseudoClassStateChanged(FOCUSED_PSEUDOCLASS_STATE, get());
-                PlatformLogger logger = Logging.getFocusLogger();
-                if (logger.isLoggable(Level.FINE)) {
-                    logger.fine(this + " focused=" + get());
-                }
+        protected boolean notifyListeners() {
+            if (lastNotifiedValue == value) {
+                return false;
+            }
 
-                needsChangeEvent = true;
+            lastNotifiedValue = value;
+            pseudoClassStateChanged(getPseudoClass(), value);
 
-                notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
+            PlatformLogger logger = Logging.getFocusLogger();
+            if (logger.isLoggable(Level.FINE)) {
+                logger.fine(this + " " + getName() + "=" + get());
             }
-        }
 
-        @Override
-        public boolean get() {
-            valid = true;
-            return value;
+            fireValueChangedEvent();
+            return true;
         }
+    }
 
-        @Override
-        public Object getBean() {
-            return Node.this;
-        }
+    /**
+     * Sets the value of the {@link #focused} and {@link #focusVisible} properties
+     * without firing change events. The value of {@link #focusWithin} is set
+     * by the implementation of {@link #focused}.
+     */
+    final void setFocusQuietly(boolean focused, boolean focusVisible) {
+        this.focused.set(focused);
+        this.focusVisible.set(focused && focusVisible);
+    }
 
-        @Override
-        public String getName() {
-            return "focused";
+    /**
+     * Fires change notifications if the value of {@link #focused}, {@link #focusVisible}
+     * or {@link #focusWithin} has changed. Change notifications for {@link #focusWithin}
+     * are fired on the current node and on all of its parents, if necessary.
+     */
+    final void notifyFocusListeners() {
+        focused.notifyListeners();
+        focusVisible.notifyListeners();
+
+        Node node = this;
+        do {
+            node.focusWithin.notifyListeners();
+            node = node.getParent();
+        } while (node != null);
+    }
+
+    /**
+     * Called when the current node was removed from the scene graph in order to clear
+     * the focus bits of the former parents.
+     */
+    private void updateRemovedParentFocus(Node oldParent) {
+        if (oldParent != null && focusWithin.get()) {
+            Node node = oldParent;
+            while (node != null) {
+                node.focused.set(false);
+                node.focusVisible.set(false);
+                node.focusWithin.set(false);
+                node = node.getParent();
+            }
+
+            oldParent.notifyFocusListeners();
         }
     }
 
@@ -8173,29 +8210,107 @@ public String getName() {
      * @see #requestFocus()
      * @defaultValue false
      */
-    private FocusedProperty focused;
+    private final FocusPropertyBase focused = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUSED_PSEUDOCLASS_STATE;
+        }
 
-    protected final void setFocused(boolean value) {
-        FocusedProperty fp = focusedPropertyImpl();
-        if (fp.value != value) {
-            fp.store(value);
-            fp.notifyListeners();
+        @Override
+        public String getName() {
+            return "focused";
+        }
+
+        @Override
+        protected boolean notifyListeners() {
+            if (super.notifyListeners()) {
+                notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
+                return true;
+            }
+            return false;
         }
+
+        @Override
+        public void set(boolean value) {
+            if (get() != value) {
+                super.set(value);
+
+                Node node = Node.this;
+                do {
+                    node.focusWithin.set(value);
+                    node = node.getParent();
+                } while (node != null);
+            }
+        }
+    };
+
+    protected final void setFocused(boolean value) {
+        setFocusQuietly(value, false);
+        notifyFocusListeners();
     }
 
     public final boolean isFocused() {
-        return focused == null ? false : focused.get();
+        return focused.get();
     }
 
     public final ReadOnlyBooleanProperty focusedProperty() {
-        return focusedPropertyImpl();
+        return focused;
     }
 
-    private FocusedProperty focusedPropertyImpl() {
-        if (focused == null) {
-            focused = new FocusedProperty();
+    /**
+     * Indicates whether this {@code Node} should visibly indicate focus.
+     * This flag is set when the node acquires input focus via keyboard navigation,
+     * and it is cleared when the node loses focus or when {@link #requestFocus()}
+     * is called.
+     *
+     * @defaultValue false
+     * @since 19
+     */
+    final FocusPropertyBase focusVisible = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUS_VISIBLE_PSEUDOCLASS_STATE;
         }
-        return focused;
+
+        @Override
+        public String getName() {
+            return "focusVisible";
+        }
+    };
+
+    public final boolean isFocusVisible() {
+        return focusVisible.get();
+    }
+
+    public final ReadOnlyBooleanProperty focusVisibleProperty() {
+        return focusVisible;
+    }
+
+    /**
+     * Indicates whether this {@code Node} or any of its descendants currently
+     * has the input focus.
+     *
+     * @defaultValue false
+     * @since 19
+     */
+    private final FocusPropertyBase focusWithin = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUS_WITHIN_PSEUDOCLASS_STATE;
+        }
+
+        @Override
+        public String getName() {
+            return "focusWithin";
+        }
+    };
+
+    public final boolean isFocusWithin() {
+        return focusWithin.get();
+    }
+
+    public final ReadOnlyBooleanProperty focusWithinProperty() {
+        return focusWithin;
     }
 
     /**
@@ -8284,10 +8399,21 @@ private void focusSetDirty(Scene s) {
      * node. The focus owner will not actually have the input focus, however,
      * unless the scene belongs to a {@code Stage} that is both visible
      * and active.
+     * <p>This method will clear the {@link #focusVisible} flag.
      */
     public void requestFocus() {
         if (getScene() != null) {
-            getScene().requestFocus(this);
+            getScene().requestFocus(this, false);
+        }
+    }
+
+    /**
+     * Requests focus as if by calling {@link #requestFocus()}, and additionally
+     * sets the {@link #focusVisible} flag.
+     */
+    private void requestFocusVisible() {
+        if (getScene() != null) {
+            getScene().requestFocus(this, true);
         }
     }
 
@@ -8297,11 +8423,11 @@ public void requestFocus() {
      * However, the node must be part of a scene, otherwise this request
      * is ignored.
      */
-    final boolean traverse(Direction dir) {
+    final boolean traverse(Direction dir, TraversalMethod method) {
         if (getScene() == null) {
             return false;
         }
-        return getScene().traverse(this, dir);
+        return getScene().traverse(this, dir, method);
     }
 
     ////////////////////////////
@@ -9608,6 +9734,8 @@ private void doProcessCSS() {
     private static final PseudoClass PRESSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("pressed");
     private static final PseudoClass DISABLED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("disabled");
     private static final PseudoClass FOCUSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focused");
+    private static final PseudoClass FOCUS_VISIBLE_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focus-visible");
+    private static final PseudoClass FOCUS_WITHIN_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focus-within");
     private static final PseudoClass SHOW_MNEMONICS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("show-mnemonics");
 
     private static abstract class LazyTransformProperty
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index aff0797f5e1..22cefa750d3 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
 
 import com.sun.glass.ui.Application;
 import com.sun.glass.ui.Accessible;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.util.Logging;
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.application.PlatformImpl;
@@ -2110,11 +2111,11 @@ final boolean isFocusDirty() {
     /**
      * Traverses focus from the given node in the given direction.
      */
-    boolean traverse(Node node, Direction dir) {
+    boolean traverse(Node node, Direction dir, TraversalMethod method) {
         if (node.getSubScene() != null) {
-            return node.getSubScene().traverse(node, dir);
+            return node.getSubScene().traverse(node, dir, method);
         }
-        return traversalEngine.trav(node, dir) != null;
+        return traversalEngine.trav(node, dir, method) != null;
     }
 
     /**
@@ -2133,7 +2134,7 @@ private void focusInitial() {
      * function assumes that it is still a member of the same scene.
      */
     private void focusIneligible(Node node) {
-        traverse(node, Direction.NEXT);
+        traverse(node, Direction.NEXT, TraversalMethod.DEFAULT);
     }
 
     void processKeyEvent(KeyEvent e) {
@@ -2146,8 +2147,8 @@ void processKeyEvent(KeyEvent e) {
         getKeyHandler().process(e);
     }
 
-    void requestFocus(Node node) {
-        getKeyHandler().requestFocus(node);
+    void requestFocus(Node node, boolean focusVisible) {
+        getKeyHandler().requestFocus(node, focusVisible);
     }
 
     private Node oldFocusOwner;
@@ -2163,11 +2164,11 @@ void requestFocus(Node node) {
         @Override
         protected void invalidated() {
             if (oldFocusOwner != null) {
-                ((Node.FocusedProperty) oldFocusOwner.focusedProperty()).store(false);
+                oldFocusOwner.setFocusQuietly(false, false);
             }
             Node value = get();
             if (value != null) {
-                ((Node.FocusedProperty) value.focusedProperty()).store(keyHandler.windowFocused);
+                value.setFocusQuietly(keyHandler.windowFocused, keyHandler.focusVisible);
                 if (value != oldFocusOwner) {
                     value.getScene().enableInputMethodEvents(
                             value.getInputMethodRequests() != null
@@ -2180,10 +2181,10 @@ protected void invalidated() {
             Node localOldOwner = oldFocusOwner;
             oldFocusOwner = value;
             if (localOldOwner != null) {
-                ((Node.FocusedProperty) localOldOwner.focusedProperty()).notifyListeners();
+                localOldOwner.notifyFocusListeners();
             }
             if (value != null) {
-                ((Node.FocusedProperty) value.focusedProperty()).notifyListeners();
+                value.notifyFocusListeners();
             }
             PlatformLogger logger = Logging.getFocusLogger();
             if (logger.isLoggable(Level.FINE)) {
@@ -2457,10 +2458,10 @@ private void focusCleanup() {
                 if (oldOwner == null) {
                     Scene.this.focusInitial();
                 } else if (oldOwner.getScene() != Scene.this) {
-                    Scene.this.requestFocus(null);
+                    Scene.this.requestFocus(null, false);
                     Scene.this.focusInitial();
                 } else if (!oldOwner.isCanReceiveFocus()) {
-                    Scene.this.requestFocus(null);
+                    Scene.this.requestFocus(null, false);
                     Scene.this.focusIneligible(oldOwner);
                 }
                 Scene.this.setFocusDirty(false);
@@ -4033,6 +4034,8 @@ private PickResult pickNode(PickRay pickRay) {
      ******************************************************************************/
 
     class KeyHandler {
+        boolean focusVisible;
+
         private void setFocusOwner(final Node value) {
             // Cancel IM composition if there is one in progress.
             // This needs to be done before the focus owner is switched as it
@@ -4049,12 +4052,18 @@ private void setFocusOwner(final Node value) {
             focusOwner.set(value);
         }
 
+        private void setFocusVisible(Node node, boolean focusVisible) {
+            node.focusVisible.set(focusVisible);
+            node.focusVisible.notifyListeners();
+        }
+
         private boolean windowFocused;
         protected boolean isWindowFocused() { return windowFocused; }
         protected void setWindowFocused(boolean value) {
             windowFocused = value;
             if (getFocusOwner() != null) {
-                getFocusOwner().setFocused(windowFocused);
+                getFocusOwner().setFocusQuietly(windowFocused, focusVisible);
+                getFocusOwner().notifyFocusListeners();
             }
             if (windowFocused) {
                 if (accessible != null) {
@@ -4089,11 +4098,17 @@ private void process(KeyEvent e) {
             Event.fireEvent(eventTarget, e);
         }
 
-        private void requestFocus(Node node) {
-            if (getFocusOwner() == node || (node != null && !node.isCanReceiveFocus())) {
-                return;
+        private void requestFocus(Node node, boolean focusVisible) {
+            if (node == null) {
+                setFocusOwner(null);
+            } else if (node.isCanReceiveFocus()) {
+                if (node != getFocusOwner()) {
+                    this.focusVisible = focusVisible;
+                    setFocusOwner(node);
+                } else {
+                    setFocusVisible(node, focusVisible);
+                }
             }
-            setFocusOwner(node);
         }
     }
     /* *************************************************************************
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
index 06b30a4bf9c..7bb95a0bed2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
 import com.sun.javafx.scene.traversal.Direction;
 import com.sun.javafx.scene.traversal.SubSceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TopMostTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
@@ -768,8 +769,8 @@ void layoutPass() {
 
     private TopMostTraversalEngine traversalEngine = new SubSceneTraversalEngine(this);
 
-    boolean traverse(Node node, Direction dir) {
-        return traversalEngine.trav(node, dir) != null;
+    boolean traverse(Node node, Direction dir, TraversalMethod method) {
+        return traversalEngine.trav(node, dir, method) != null;
     }
 
     private enum SubSceneDirtyBits {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
index a356bcd5d42..174fc5eccb9 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,20 @@
 import com.sun.javafx.css.PseudoClassState;
 import com.sun.javafx.css.PseudoClassStateShim;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
 import javafx.css.PseudoClass;
 import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -46,7 +51,37 @@
  */
 public class PseudoClassTest {
 
-    public PseudoClassTest() {
+    private static Map<String, Integer> initialPseudoClassMap;
+    private static List<PseudoClass> initialPseudoClasses;
+
+    /**
+     * Before we run any of the tests in this class, we must store the current content
+     * of both the 'PseudoClassState.pseudoClassMap' and 'PseudoClassState.pseudoClasses'
+     * static fields, and restore the exact content after we have completed all tests.
+     *
+     * Once a pseudo-class has been loaded via 'PseudoClass.getPseudoClass(String)', the
+     * returned singleton 'PseudoClassImpl' instance will be stored in the static list
+     * 'PseudoClassState.pseudoClasses', and the instance will store the index of itself
+     * in this list.
+     *
+     * Clearing the content of 'pseudoClassMap' and 'pseudoClasses' will therefore break
+     * existing 'PseudoClass' instances, because their stored index will no longer refer
+     * to the correct instance in the 'pseudoClasses' list. This can cause other tests
+     * that happen to use a broken pseudo-class instance to fail undeterministically,
+     * depending on whether or not they are executed before or after this class.
+     */
+    @BeforeClass
+    public static void beforeClass() {
+        initialPseudoClassMap = new HashMap<>(PseudoClassStateShim.pseudoClassMap);
+        initialPseudoClasses = new ArrayList<>(PseudoClassStateShim.pseudoClasses);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        PseudoClassStateShim.pseudoClassMap.clear();
+        PseudoClassStateShim.pseudoClassMap.putAll(initialPseudoClassMap);
+        PseudoClassStateShim.pseudoClasses.clear();
+        PseudoClassStateShim.pseudoClasses.addAll(initialPseudoClasses);
     }
 
     @Before
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
index 5c3d6bef43d..80339284c61 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
 import com.sun.javafx.scene.traversal.TopMostTraversalEngine;
 import com.sun.javafx.scene.traversal.TopMostTraversalEngineShim;
 import com.sun.javafx.scene.traversal.TraversalContext;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -259,7 +260,7 @@ public void selectNext() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -271,7 +272,7 @@ public void selectNextFromParent() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(ng1, engine.trav(n1, Direction.NEXT));
+        assertEquals(ng1, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -282,7 +283,7 @@ public void selectNextFromParent_2() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -293,7 +294,7 @@ public void selectNextInParentSibling() {
         ParentShim.getChildren(root).addAll(createFocusableNode(), new Group(new Group(n1, createFocusableDisabledNode(), createFocusableDisabledNode()),
                 new Group(createFocusableDisabledNode())), new Group(n2));
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -304,7 +305,7 @@ public void selectNextFocusableParent() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), n1, createFocusableDisabledNode(), g));
 
-        assertEquals(g, engine.trav(n1, Direction.NEXT));
+        assertEquals(g, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -334,7 +335,7 @@ public Node selectLast(TraversalContext context) {
 
         ParentShim.getChildren(root).add(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
 
@@ -367,7 +368,7 @@ public Node selectLast(TraversalContext context) {
         final Node n3 = createFocusableNode();
         ParentShim.getChildren(root).addAll(g, n3);
 
-        assertEquals(n3, engine.trav(n1, Direction.NEXT));
+        assertEquals(n3, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -379,7 +380,7 @@ public void selectNextInLine() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT_IN_LINE));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT_IN_LINE, TraversalMethod.DEFAULT));
     }
 
 
@@ -391,7 +392,7 @@ public void selectPrevious() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -403,7 +404,7 @@ public void selectPreviousFromParent() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -414,7 +415,7 @@ public void selectPreviousFromParent_2() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -426,7 +427,7 @@ public void selectPreviousInParentSibling() {
                 new Group(new Group(createFocusableDisabledNode(), n1, createFocusableDisabledNode())),
                  createFocusableNode());
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -438,7 +439,7 @@ public void selectPreviousFocusableParentsNode() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), g, n1, createFocusableDisabledNode()));
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -450,7 +451,7 @@ public void selectPreviousFocusableParent() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), n1, g, createFocusableDisabledNode()));
 
-        assertEquals(g, engine.trav(n2, Direction.PREVIOUS));
+        assertEquals(g, engine.trav(n2, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -460,7 +461,7 @@ public void selectNextToLast() {
 
         ParentShim.getChildren(root).addAll(new Group(n2), new Group(createFocusableNode(), n1));
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
 
@@ -471,7 +472,7 @@ public void selectPreviousToFirst() {
 
         ParentShim.getChildren(root).addAll(new Group(n1, createFocusableNode()), new Group(n2));
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
 
@@ -502,7 +503,7 @@ public Node selectLast(TraversalContext context) {
 
         ParentShim.getChildren(root).add(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     private Node createFocusableNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
index 892f4ef0ac5..a3665a50ce6 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 import com.sun.javafx.scene.traversal.SceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import static org.junit.Assert.assertEquals;
@@ -181,7 +182,7 @@ public void tearDown() {
     @Test
     public void untransformedTraversalTest() {
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumber - 1].isFocused());
     }
 
@@ -189,7 +190,7 @@ public void untransformedTraversalTest() {
     public void transformedTraversalTest() {
         scene.getRoot().setRotate(90);
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumberTransformed - 1].isFocused());
     }
 
@@ -199,7 +200,7 @@ public void traverseListenerTest() {
                 new TraverseListenerImpl();
         traversalEngine.addTraverseListener(traverseListener);
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         if (fromNumber != toNumber) {
             assertEquals(1, traverseListener.getCallCounter());
             assertSame(keypadNodes[toNumber - 1],
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
index 6dd6aeeabdb..d31fa454b97 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 import com.sun.javafx.scene.traversal.SceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import static org.junit.Assert.assertEquals;
@@ -124,7 +125,7 @@ public void tearDown() {
     public void traverseOverInvisible() {
         keypadNodes[fromNumber].requestFocus();
         keypadNodes[invisibleNumber].setVisible(false);
-        traversalEngine.trav(keypadNodes[fromNumber], direction);
+        traversalEngine.trav(keypadNodes[fromNumber], direction, TraversalMethod.DEFAULT);
 
         assertTrue(keypadNodes[toNumber].isFocused());
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 81d96de3a91..ff0057a3663 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
 
 
 import com.sun.javafx.scene.SceneHelper;
+import javafx.event.Event;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import test.com.sun.javafx.pgstub.StubScene;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
@@ -39,10 +42,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
+
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.ParentShim;
@@ -113,17 +113,55 @@ Node n() {
     private void assertIsFocused(Scene s, Node n) {
         assertEquals(n, s.getFocusOwner());
         assertTrue(n.isFocused());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
     }
 
     private void assertNotFocused(Scene s, Node n) {
         assertTrue(n != s.getFocusOwner());
         assertFalse(n.isFocused());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
     }
 
     private void assertNullFocus(Scene s) {
         assertNull(s.getFocusOwner());
     }
 
+    private void assertIsFocusVisible(Node n) {
+        assertTrue(n.isFocusVisible());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertNotFocusVisible(Node n) {
+        assertFalse(n.isFocusVisible());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertIsFocusWithin(Node n) {
+        assertTrue(n.isFocusWithin());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertNotFocusWithin(Node n) {
+        assertFalse(n.isFocusWithin());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertIsFocusWithinParents(Node n) {
+        do {
+            assertTrue(n.isFocusWithin());
+            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    private void assertNotFocusWithinParents(Node n) {
+        do {
+            assertFalse(n.isFocusWithin());
+            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
     /**
      * Test setting of initial focus.
      */
@@ -732,6 +770,168 @@ public void testSwitchScenes(){
         assertTrue(actionTaken);
     }
 
-    // TODO: tests for moving nodes between scenes
-    // and active and inactive stages
+    private void fireTabKeyEvent(Node node) {
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
+    }
+
+    /**
+     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
+     */
+    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
+        Node node = n();
+        scene.setRoot(new Group(node));
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
+     */
+    @Test public void testKeyFocusTraversalSetsFocusVisible() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+    }
+
+    /**
+     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
+     * visible focus is removed from the node.
+     */
+    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * When a node loses focus, it also loses visible focus.
+     */
+    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
+        Node node1 = n();
+        Node node2 = n();
+        Group g = new Group(node1, node2);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node1);
+        assertIsFocusVisible(node1);
+
+        node2.requestFocus();
+
+        assertNotFocused(scene, node1);
+        assertNotFocusVisible(node1);
+        assertIsFocused(scene, node2);
+        assertNotFocusVisible(node2);
+    }
+
+    /**
+     * When a node acquires focus, the focusWithin property is set on the node
+     * and all of its parents.
+     */
+    @Test public void testFocusWithinIsTrueOnAllParents() {
+        Node node1 = n();
+        Group g = new Group(new Group(new Group(node1)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+    }
+
+    /**
+     * When a node loses focus, the focusWithin property of its parents is cleared.
+     */
+    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+        assertNotFocusWithinParents(node2);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+        assertNotFocusWithin(node2);
+        assertNotFocusWithin(node2.getParent());
+        assertNotFocusWithin(node2.getParent().getParent());
+
+        node2.requestFocus();
+
+        assertIsFocusWithinParents(node2);
+        assertNotFocusWithin(node1);
+        assertNotFocusWithin(node1.getParent());
+        assertNotFocusWithin(node1.getParent().getParent());
+    }
+
+    /**
+     * When a node loses focus, all of its parents also lose focusWithin.
+     * However, if focus transitions to a new node, and the new node is also a child of the
+     * parent that just lost focusWithin, the parent will re-gain focusWithin.
+     *
+     * Since focus traversal is specified to be an atomic operation, the fact that
+     * the parent technically lost and re-gained focusWithin must not be observable.
+     */
+    @Test public void testFocusWithinListenerIsNotInvokedIfPropertyDidNotEffectivelyChange() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        List<Boolean> focusWithinValues = new ArrayList<>();
+        g.focusWithinProperty().addListener((observable, oldValue, newValue) -> focusWithinValues.add(newValue));
+
+        node1.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+
+        node2.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+    }
+
+    /**
+     * When a focused node is removed from the scene graph, the focus states
+     * of its former parents are cleared.
+     */
+    @Test public void testFocusStatesAreClearedFromFormerParentsOfFocusedNode() {
+        Node node1 = n(), node2 = n();
+        Group g2, g3, g1 = new Group(g2 = new Group(g3 = new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g1);
+
+        node1.requestFocus();
+        assertIsFocusWithin(g1);
+        assertIsFocusWithin(g2);
+        assertIsFocusWithin(g3);
+
+        g2.getChildren().remove(0);
+        assertNotFocusWithin(g1);
+        assertNotFocusWithin(g2);
+    }
+
 }
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
index 12f3eac5803..ab811b24aa2 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 import java.security.PrivilegedAction;
 
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Cursor;
@@ -111,7 +112,7 @@ public WebPageClientImpl(Accessor accessor) {
     }
 
     @Override public void transferFocus(boolean forward) {
-        NodeHelper.traverse(accessor.getView(), forward ? Direction.NEXT : Direction.PREVIOUS);
+        NodeHelper.traverse(accessor.getView(), forward ? Direction.NEXT : Direction.PREVIOUS, TraversalMethod.DEFAULT);
     }
 
     @Override public WCRectangle getScreenBounds(boolean available) {