Convert _parentElement to _parentComponent

Author: I-Milanov

src/Bellatrix.Web/components/core/Component.cs

@@ -226,7 +226,7 @@ public ComponentsList<TComponent> CreateAll<TComponent, TBy>(TBy by)
         }
         else
         {
-            elementsCollection = new ComponentsList<TComponent>(by, WrappedElement, ShouldCacheElement);
+            elementsCollection = new ComponentsList<TComponent>(by, this, ShouldCacheElement);
         }
 
         CreatedComponents?.Invoke(this, new ComponentActionEventArgs(this));

src/Bellatrix.Web/components/core/ComponentList/ComponentsList.cs

@@ -12,15 +12,21 @@
 // <author>Anton Angelov</author>
 // <site>https://bellatrix.solutions/</site>
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Bellatrix.Utilities;
 using Bellatrix.Web.Waits;
+using OpenQA.Selenium;
 
 namespace Bellatrix.Web;
 
 public class ComponentsList<TComponent> : IEnumerable<TComponent>
     where TComponent : Component
 {
     private readonly FindStrategy _by;
-    private readonly IWebElement _parentElement;
+    private readonly Component _parentComponent;
     private readonly List<TComponent> _foundElements;
     private readonly bool _shouldCacheFoundElements;
     private List<TComponent> _cachedElements;
@@ -39,7 +45,7 @@ public ComponentsList(
         Component parenTComponent)
     {
         _by = by;
-        _parentElement = parenTComponent;
+        _parentComponent = parenTComponent;
         _foundElements = new List<TComponent>();
         WrappedDriver = ServicesCollection.Current.Resolve<IWebDriver>();
     }
@@ -143,10 +149,10 @@ IEnumerable<TComponent> GetAndWaitNativeElements()
                 foreach (var nativeElement in nativeElements)
                 {
                     var elementRepository = new ComponentRepository();
-                    if (_parentElement != null)
+                    if (_parentComponent != null)
                     {
                         var element =
-                            elementRepository.CreateComponentWithParent<TComponent>(_by, _parentElement, nativeElement, index++, _shouldCacheFoundElements);
+                            elementRepository.CreateComponentWithParent<TComponent>(_by, _parentComponent, nativeElement, index++, _shouldCacheFoundElements);
                         yield return element;
                     }
                     else
@@ -162,11 +168,11 @@ IEnumerable<TComponent> GetAndWaitNativeElements()
 
     private IEnumerable<IWebElement> WaitWebDriverElements()
     {
-        var elementFinder = _parentElement == null
+        var elementFinder = _parentComponent == null
             ? new NativeElementFinderService(WrappedDriver)
-            : new NativeElementFinderService(_parentElement);
+            : new NativeElementFinderService(_parentComponent.WrappedElement);
         var elementWaiter = new ComponentWaitService();
-        if (_parentElement == null)
+        if (_parentComponent == null)
         {
             return ConditionalWait(elementFinder);
         }

src/Bellatrix.Web/findstrategies/Angular/ElementCreateExtensions.cs

@@ -28,14 +28,14 @@ public static TComponent CreateByNgSelectedOption<TComponent>(this Component ele
         where TComponent : Component => element.Create<TComponent, ByNgSelectedOption>(new ByNgSelectedOption(selectedOption));
 
     public static ComponentsList<TComponent> CreateAllByNgBinding<TComponent>(this Component element, string binding)
-        where TComponent : Component => new ComponentsList<TComponent>(new ByNgBinding(binding), element.WrappedElement);
+        where TComponent : Component => new ComponentsList<TComponent>(new ByNgBinding(binding), element);
 
     public static ComponentsList<TComponent> CreateAllByNgModel<TComponent>(this Component element, string model)
-        where TComponent : Component => new ComponentsList<TComponent>(new ByNgModel(model), element.WrappedElement);
+        where TComponent : Component => new ComponentsList<TComponent>(new ByNgModel(model), element);
 
     public static ComponentsList<TComponent> CreateAllByNgRepeater<TComponent>(this Component element, string repeater)
-        where TComponent : Component => new ComponentsList<TComponent>(new ByNgRepeater(repeater), element.WrappedElement);
+        where TComponent : Component => new ComponentsList<TComponent>(new ByNgRepeater(repeater), element);
 
     public static ComponentsList<TComponent> CreateAllByNgSelectedOption<TComponent>(this Component element, string selectedOption)
-        where TComponent : Component => new ComponentsList<TComponent>(new ByNgSelectedOption(selectedOption), element.WrappedElement);
+        where TComponent : Component => new ComponentsList<TComponent>(new ByNgSelectedOption(selectedOption), element);
 }

templates/Bellatrix.Web.GettingStarted/33. Add New Find Locators/ElementCreateExtensions.cs

@@ -7,5 +7,5 @@ public static class ElementCreateExtensions
     // public static TComponent CreateByIdStartingWith<TComponent>(this Element element, string idPrefix)
     // where TComponent : Element => ComponentCreateService.Create<TComponent, FindIdStartingWithStrategy>(new FindIdStartingWithStrategy(idPrefix));
     public static ComponentsList<TComponent> CreateAllByIdStartingWith<TComponent>(this Component element, string idEnding)
-        where TComponent : Component => new ComponentsList<TComponent>(new FindIdStartingWithStrategy(idEnding), element.WrappedElement);
+        where TComponent : Component => new ComponentsList<TComponent>(new FindIdStartingWithStrategy(idEnding), element);
 }