improvement

Author: vculea

pom.xml

@@ -150,19 +150,19 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>7.16.1</version>
+            <version>7.18.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-spring</artifactId>
-            <version>7.16.1</version>
+            <version>7.18.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>7.16.1</version>
+            <version>7.18.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/sdl/selenium/extjs6/grid/Grid.java

@@ -353,8 +353,8 @@ public <V> List<List<String>> getLists(int rows, Options<V> options, List<Intege
         do {
             for (int i = 1; i <= rows; ++i) {
                 if (canRead) {
-                    List<String> list = options.getCollector() == null ? collector(options, columnsList, this, i) : options.getCollector().apply(new Details<>(options, columnsList, this, i));
-                    listOfList.add(list);
+                    List<List<String>> lists = options.getCollector() == null ? collector(options, columnsList, this, i) : options.getCollector().apply(new Details<>(options, columnsList, this, i));
+                    listOfList.addAll(lists);
                 } else {
                     if (size == i + 1) {
                         break;
@@ -389,13 +389,15 @@ public <V> List<List<String>> getLists(int rows, Options<V> options, List<Intege
         return listOfList;
     }
 
-    private <V> List<String> collector(Options<V> options, List<Integer> columnsList, Grid grid, int i) {
+    private <V> List<List<String>> collector(Options<V> options, List<Integer> columnsList, Grid grid, int i) {
         Row row = new Row(grid).setTag("tr").setResultIdx(i);
         if (options.isExpand()) {
             row.setTemplate("visibility", "count(ancestor-or-self::*[contains(@class, 'x-grid-rowbody-tr')]) = 0").setVisibility(true);
         }
+        List<List<String>> listOfList = new ArrayList<>();
         List<String> list = row.getValues(options, columnsList);
-        return list;
+        listOfList.add(list);
+        return listOfList;
     }
 
     @Override

src/main/java/com/sdl/selenium/extjs6/grid/Options.java

@@ -16,7 +16,7 @@ public class Options<V> {
     private boolean expand;
     private Predicate<Integer> predicate;
     private Function<Cell, String> function;
-    private Function<Details<V>, List<String>> collector;
+    private Function<Details<V>, List<List<String>>> collector;
 
     public Options(V type) {
         this.type = type;
@@ -33,12 +33,12 @@ public Options(V type, boolean expand, Predicate<Integer> predicate, Function<Ce
         this.expand = expand;
     }
 
-    public Options(V type, boolean expand, Predicate<Integer> predicate, Function<Cell, String> function, Function<Details<V>, List<String>> collector) {
+    public Options(V type, boolean expand, Predicate<Integer> predicate, Function<Cell, String> function, Function<Details<V>, List<List<String>>> collector) {
         this(type, expand, predicate, function);
         this.collector = collector;
     }
 
-    public Options(V type, Function<Details<V>, List<String>> collector) {
+    public Options(V type, Function<Details<V>, List<List<String>>> collector) {
         this(type);
         this.collector = collector;
     }