Merge pull request #19 from danurna/fix-stride-error

Fix stride error
pietropizzi · Feb 21, 2022 · 777c3b9 · 777c3b9
2 parents 011a397 + 662ebd4
commit 777c3b9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Sources/GridStack/Array+chunked.swift b/Sources/GridStack/Array+chunked.swift
@@ -1,6 +1,10 @@
 extension Array {
     func chunked(into size: Int) -> [[Element]] {
-        stride(from: 0, to: count, by: size).map {
+        guard size > 0 else {
+            return [self]
+        }
+
+        return stride(from: 0, to: count, by: size).map {
             Array(self[$0 ..< Swift.min($0 + size, count)])
         }
     }

diff --git a/Sources/GridStack/GridStack.swift b/Sources/GridStack/GridStack.swift
@@ -81,14 +81,16 @@ private struct InnerGrid<Content>: View where Content: View {
     var body : some View {
         ScrollView(.vertical) {
             VStack(alignment: alignment, spacing: spacing) {
-                ForEach(rows, id: \.self) { row in
-                    HStack(spacing: self.spacing) {
-                        ForEach(row, id: \.self) { item in
-                            // Pass the index and the cell width to the content
-                            self.content(item, self.columnWidth)
-                                .frame(width: self.columnWidth)
-                        }
-                    }.padding(.horizontal, self.spacing)
+                if self.columnWidth > 0 {
+                    ForEach(rows, id: \.self) { row in
+                        HStack(spacing: self.spacing) {
+                            ForEach(row, id: \.self) { item in
+                                // Pass the index and the cell width to the content
+                                self.content(item, self.columnWidth)
+                                    .frame(width: self.columnWidth)
+                            }
+                        }.padding(.horizontal, self.spacing)
+                    }
                 }
             }
             .padding(.top, spacing)