From 7e2c1043ffc2d451c116c648243f29758f232b34 Mon Sep 17 00:00:00 2001
From: Harsimranjeet Singh <ranjeetsingh8481@gmail.com>
Date: Mon, 8 Jul 2024 19:33:03 +0530
Subject: [PATCH] code rabbit changes

---
 .../Drivers/CoreDrivers/Web/GingerWebDriver.cs             | 1 -
 .../Drivers/CoreDrivers/Web/POM/POMLearner.cs              | 7 +------
 .../Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs | 6 ++++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/GingerWebDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/GingerWebDriver.cs
index 5226f07186..75718730d1 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/GingerWebDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/GingerWebDriver.cs
@@ -304,7 +304,6 @@ private protected async Task InjectLiveSpyScriptAsync(IBrowserTab tab)
         private protected Task InjectScriptAsync(IBrowserTab tab, string script)
         {
             string injectionableScript = PrepareScriptForInjection(script);
-            //return tab.ExecuteJavascriptAsync(injectionableScript);
             return tab.InjectJavascriptAsync(injectionableScript);
         }
 
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
index 57b3767293..31780a53af 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/POM/POMLearner.cs
@@ -89,12 +89,7 @@ private async Task<IEnumerable<HTMLElementInfo>> LearnHtmlNodeChildElements(Html
                 }
 
                 IBrowserElement? browserElement = await _browserElementProvider.GetElementAsync(eLocateBy.ByXPath, childNode.XPath);
-                if (browserElement == null)
-                {
-                    continue;
-                }
-
-                if (!await browserElement.IsVisibleAsync())
+                if (browserElement == null || !await browserElement.IsVisibleAsync())
                 {
                     continue;
                 }
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
index f7236dfd8d..8726923b3d 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightDriver.cs
@@ -543,11 +543,13 @@ public ElementInfo GetControlFromMousePosition()
 
                 IBrowserElement? browserElement = null;
                 try
+                {    
+                    browserElement = (await currentTab.GetElementsAsync("GingerLibLiveSpy.ElementFromPoint();")).FirstOrDefault();
+                }
+                catch (Exception) 
                 {
                     //when we spy the element for the first time, it throws exception because X,Y point of mouse position is undefined for some reason
-                    browserElement = (await currentTab.GetElementsAsync("GingerLibLiveSpy.ElementFromPoint();")).FirstOrDefault();
                 }
-                catch (Exception) { }
                 if (browserElement == null)
                 {
                     return null!;