Skip to content

Make the data conform to RandomAccessCollection #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gordan-glavas-codecons merged 2 commits into from
Sep 5, 2024
Merged

Make the data conform to RandomAccessCollection #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d8f9f
feat: make the data conform to RandomAccessCollection
MojtabaHs Sep 3, 2024
bc2fdd3
test: add a simple preview showing off accepting a range of numbers
MojtabaHs Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions Sources/SwiftUIFlowLayout/SwiftUIFlowLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import SwiftUI

public let flowLayoutDefaultItemSpacing: CGFloat = 4

public struct FlowLayout<RefreshBinding, Data, ItemView: View>: View {
public struct FlowLayout<RefreshBinding, Data: RandomAccessCollection, ItemView: View>: View where Data.Element: Hashable {
let mode: Mode
@Binding var binding: RefreshBinding
let items: [Data]
let items: Data
let itemSpacing: CGFloat
@ViewBuilder let viewMapping: (Data) -> ItemView
@ViewBuilder let viewMapping: (Data.Element) -> ItemView

@State private var totalHeight: CGFloat

public init(mode: Mode,
binding: Binding<RefreshBinding>,
items: [Data],
items: Data,
itemSpacing: CGFloat = flowLayoutDefaultItemSpacing,
@ViewBuilder viewMapping: @escaping (Data) -> ItemView) {
@ViewBuilder viewMapping: @escaping (Data.Element) -> ItemView) {
self.mode = mode
_binding = binding
self.items = items
Expand Down Expand Up @@ -100,9 +100,9 @@ private struct HeightReaderView: View {

public extension FlowLayout where RefreshBinding == Never? {
init(mode: Mode,
items: [Data],
items: Data,
itemSpacing: CGFloat = flowLayoutDefaultItemSpacing,
@ViewBuilder viewMapping: @escaping (Data) -> ItemView) {
@ViewBuilder viewMapping: @escaping (Data.Element) -> ItemView) {
self.init(mode: mode,
binding: .constant(nil),
items: items,
Expand Down Expand Up @@ -165,3 +165,18 @@ struct TestWithDeletion_Previews: PreviewProvider {
TestWithDeletion()
}
}

struct TestWithRange_Previews: PreviewProvider {
static var previews: some View {
FlowLayout(mode: .scrollable,
items: 1..<100) {
Text("\($0)")
.font(.system(size: 12))
.foregroundColor(.black)
.padding()
.background(RoundedRectangle(cornerRadius: 4)
.border(Color.gray)
.foregroundColor(Color.gray))
}.padding()
}
}