From 6218e2f92b4396e3c40f562d2702d340ba10b526 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 21 Oct 2021 16:19:02 +0100
Subject: [PATCH] Fix bug in LabelKeyboardFocusTraverser causing editable
 labels to consume focus traversal events

---
 .../juce_gui_basics/widgets/juce_Label.cpp    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/modules/juce_gui_basics/widgets/juce_Label.cpp b/modules/juce_gui_basics/widgets/juce_Label.cpp
index 5a263be994..f654678918 100644
--- a/modules/juce_gui_basics/widgets/juce_Label.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Label.cpp
@@ -409,16 +409,8 @@ public:
 
     Component* getDefaultComponent (Component* parent) override
     {
-        auto getContainer = [&]
-        {
-            if (owner.getCurrentTextEditor() != nullptr && parent == &owner)
-                return owner.findKeyboardFocusContainer();
-
-            return parent;
-        };
-
-        if (auto* container = getContainer())
-            KeyboardFocusTraverser::getDefaultComponent (container);
+        if (auto* container = getKeyboardFocusContainer (parent))
+            return KeyboardFocusTraverser::getDefaultComponent (container);
 
         return nullptr;
     }
@@ -426,6 +418,14 @@ public:
     Component* getNextComponent     (Component* c) override  { return KeyboardFocusTraverser::getNextComponent     (getComp (c)); }
     Component* getPreviousComponent (Component* c) override  { return KeyboardFocusTraverser::getPreviousComponent (getComp (c)); }
 
+    std::vector<Component*> getAllComponents (Component* parent) override
+    {
+        if (auto* container = getKeyboardFocusContainer (parent))
+            return KeyboardFocusTraverser::getAllComponents (container);
+
+        return {};
+    }
+
 private:
     Component* getComp (Component* current) const
     {
@@ -436,6 +436,14 @@ private:
         return current;
     }
 
+    Component* getKeyboardFocusContainer (Component* parent) const
+    {
+        if (owner.getCurrentTextEditor() != nullptr && parent == &owner)
+            return owner.findKeyboardFocusContainer();
+
+        return parent;
+    }
+
     Label& owner;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LabelKeyboardFocusTraverser)