Whitelist the Tab key from the filter

ManlyMarco · ManlyMarco · commit 3a08eabd8595 · 2020-11-22T05:35:03.000+01:00
diff --git a/BepInEx.InputHotkeyBlock/InputHotkeyBlock.cs b/BepInEx.InputHotkeyBlock/InputHotkeyBlock.cs
@@ -31,11 +31,16 @@ internal void Main()
         private static GameObject previousSelectedGameObject;
         private static bool previousState;
 
+        private static bool inhibit;
+
         /// <summary>
         /// Check if an input field is selected
         /// </summary>
         private static bool AllowInput()
         {
+            if (inhibit)
+                return true;
+
             //UI elements from some mods
             if (GUIUtility.keyboardControl > 0)
                 return false;
@@ -44,20 +49,22 @@ private static bool AllowInput()
             if (currentSelectedGameObject != null)
             {
                 // Buffer results to prevent unnecessary GetComponent calls
-                if (currentSelectedGameObject == previousSelectedGameObject) 
+                if (currentSelectedGameObject == previousSelectedGameObject)
+                {
+                    if (IsWhitelistedKey()) return true;
                     return previousState;
+                }
 
                 previousSelectedGameObject = currentSelectedGameObject;
-                previousState = false;
 
-                //TextMeshPro InputField
-                if (TMPInputFieldType != null)
-                    if (currentSelectedGameObject.GetComponent(TMPInputFieldType) != null)
-                        return false;
+                if (currentSelectedGameObject.GetComponent<InputField>() != null ||
+                    TMPInputFieldType != null && currentSelectedGameObject.GetComponent(TMPInputFieldType) != null)
+                {
+                    previousState = false;
 
-                //Other InputFields
-                if (currentSelectedGameObject.GetComponent<InputField>() != null)
+                    if (IsWhitelistedKey()) return true;
                     return false;
+                }
             }
             else
             {
@@ -68,6 +75,14 @@ private static bool AllowInput()
             return true;
         }
 
+        private static bool IsWhitelistedKey()
+        {
+            inhibit = true;
+            var isWhitelistedKey = Input.GetKey(KeyCode.Tab);
+            inhibit = false;
+            return isWhitelistedKey;
+        }
+
         /// <summary>
         /// GetKey hooks. When HotkeyBlock returns false the GetKey functions will be prevented from running.
         /// </summary>
