@momo-kits/native-kits 0.300.3 → 0.300.4-debug

package/ios/Layout/Card.swift

@@ -0,0 +1,50 @@
+import SwiftUI
+
+/// Rounded surface laid out on the kit grid (8pt gutter), inset by the screen margin.
+/// Mirrors `vn.momo.kits.layout.Card`.
+public struct CardView<Content: View>: View {
+    @Environment(\.appTheme) private var theme
+
+    // MARK: Lifecycle
+
+    public init(
+        useShadow: Bool = false,
+        backgroundImage: String? = nil,
+        backgroundColor: Color? = nil,
+        contentPadding: EdgeInsets = EdgeInsets(top: Spacing.M, leading: Spacing.M, bottom: Spacing.M, trailing: Spacing.M),
+        @ViewBuilder content: @escaping () -> Content
+    ) {
+        self.useShadow = useShadow
+        self.backgroundImage = backgroundImage
+        self.backgroundColor = backgroundColor
+        self.contentPadding = contentPadding
+        self.content = content
+    }
+
+    // MARK: Public
+
+    public var body: some View {
+        GridFlow(gutter: Spacing.S, content: content)
+            .padding(contentPadding)
+            .background(background)
+            .background(backgroundColor ?? theme.colors.background.surface)
+            .clipShape(RoundedRectangle(cornerRadius: Radius.M))
+            // Approximates Compose `shadow(6.dp)` elevation.
+            .shadow(color: Color.black.opacity(useShadow ? 0.12 : 0), radius: useShadow ? 6 : 0, x: 0, y: useShadow ? 3 : 0)
+            .padding(.horizontal, Spacing.M)
+    }
+
+    // MARK: Private
+
+    private let useShadow: Bool
+    private let backgroundImage: String?
+    private let backgroundColor: Color?
+    private let contentPadding: EdgeInsets
+    private let content: () -> Content
+
+    @ViewBuilder private var background: some View {
+        if let backgroundImage {
+            ImageView(backgroundImage, contentMode: .fill).clipped()
+        }
+    }
+}

package/ios/Layout/GridContext.swift

@@ -1,20 +1,31 @@
 import SwiftUI
 
-/// Grid metrics published by a layout container (`SectionView`) so span-based children
+/// Grid metrics published by a layout container (`SectionView`, `CardView`) so span-based children
 /// can size themselves. Mirrors `vn.momo.kits.layout.GridContext`.
 public struct GridContext: Equatable {
     public let numberOfColumns: Int
     public let gutter: CGFloat
     public let sizePerSpan: CGFloat
+    /// Pixels per point; span sizes are floored onto the pixel grid when it is set.
+    public let displayScale: CGFloat
 
-    public init(numberOfColumns: Int = 12, gutter: CGFloat = Spacing.M, sizePerSpan: CGFloat = 0) {
+    public init(
+        numberOfColumns: Int = 12,
+        gutter: CGFloat = Spacing.M,
+        sizePerSpan: CGFloat = 0,
+        displayScale: CGFloat = 0
+    ) {
         self.numberOfColumns = numberOfColumns
         self.gutter = gutter
         self.sizePerSpan = sizePerSpan
+        self.displayScale = displayScale
     }
 
     public func sizeForSpan(_ span: Int) -> CGFloat {
-        sizePerSpan * CGFloat(span) + gutter * CGFloat(span - 1)
+        let size = sizePerSpan * CGFloat(span) + gutter * CGFloat(span - 1)
+        guard displayScale > 0 else { return size }
+        // Compose floors in pixels so a full row of spans never overflows by a sub-pixel.
+        return floor(size * displayScale) / displayScale
     }
 }
 
@@ -28,3 +39,176 @@ public extension EnvironmentValues {
         set { self[GridContextKey.self] = newValue }
     }
 }
+
+/// Measures the width it is given, publishes the grid for it and wraps children in a flow row.
+/// Shared body of `SectionView` and `CardView` (Compose `gridColumns()` + `gridContext()` + `FlowRow`).
+struct GridFlow<Content: View>: View {
+    let gutter: CGFloat
+    let content: () -> Content
+
+    @Environment(\.screenLayout) private var screenLayout
+    @Environment(\.displayScale) private var displayScale
+    /// The Compose `BoxWithConstraints` width.
+    @State private var availableWidth: CGFloat = 0
+
+    var body: some View {
+        flow
+            .environment(\.gridContext, grid)
+            .frame(maxWidth: .infinity, alignment: .topLeading)
+            .background(widthReader)
+    }
+
+    private var grid: GridContext {
+        let columns = screenLayout.contentWidth > 600 ? 24 : 12
+        let column = (availableWidth - gutter * CGFloat(columns - 1)) / CGFloat(columns)
+        return GridContext(
+            numberOfColumns: columns,
+            gutter: gutter,
+            sizePerSpan: max(0, column),
+            displayScale: displayScale
+        )
+    }
+
+    @ViewBuilder private var flow: some View {
+        if #available(iOS 16.0, *) {
+            FlowRowLayout(gutter: gutter) { content() }
+        } else {
+            _VariadicView.Tree(FlowRowFallback(gutter: gutter, maxWidth: availableWidth)) { content() }
+        }
+    }
+
+    private var widthReader: some View {
+        GeometryReader { proxy in
+            Color.clear.preference(key: GridWidthKey.self, value: proxy.size.width)
+        }
+        .onPreferenceChange(GridWidthKey.self) { availableWidth = $0 }
+    }
+}
+
+private struct GridWidthKey: PreferenceKey {
+    static var defaultValue: CGFloat = 0
+
+    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}
+
+/// iOS 15 has no `Layout`: the children are measured, then pinned to the same rows as
+/// `FlowRowLayout` through alignment guides.
+private struct FlowRowFallback: _VariadicView_UnaryViewRoot {
+    let gutter: CGFloat
+    let maxWidth: CGFloat
+
+    func body(children: _VariadicView.Children) -> some View {
+        FlowRowPlacement(children: children, gutter: gutter, maxWidth: maxWidth)
+    }
+}
+
+private struct FlowRowPlacement: View {
+    let children: _VariadicView.Children
+    let gutter: CGFloat
+    let maxWidth: CGFloat
+    @State private var sizes: [AnyHashable: CGSize] = [:]
+
+    var body: some View {
+        let placement = place()
+        ZStack(alignment: .topLeading) {
+            ForEach(children) { child in
+                child
+                    // FlowRowLayout proposes no height
+                    .fixedSize(horizontal: false, vertical: true)
+                    .background(
+                        GeometryReader { proxy in
+                            Color.clear.preference(key: FlowChildSizesKey.self, value: [child.id: proxy.size])
+                        }
+                    )
+                    .alignmentGuide(.leading) { _ in -(placement.origins[child.id]?.x ?? 0) }
+                    .alignmentGuide(.top) { _ in -(placement.origins[child.id]?.y ?? 0) }
+            }
+        }
+        .frame(height: placement.height, alignment: .topLeading)
+        .onPreferenceChange(FlowChildSizesKey.self) { sizes = $0 }
+    }
+
+    private func place() -> (origins: [AnyHashable: CGPoint], height: CGFloat) {
+        var origins: [AnyHashable: CGPoint] = [:]
+        var x: CGFloat = 0
+        var y: CGFloat = 0
+        var rowHeight: CGFloat = 0
+        for child in children {
+            let size = sizes[child.id] ?? .zero
+            // Sub-point tolerance: spans are computed to land exactly on `maxWidth`.
+            if x > 0, x + size.width > maxWidth + 0.5 {
+                x = 0
+                y += rowHeight + gutter
+                rowHeight = 0
+            }
+            origins[child.id] = CGPoint(x: x, y: y)
+            x += size.width + gutter
+            rowHeight = max(rowHeight, size.height)
+        }
+        return (origins, y + rowHeight)
+    }
+}
+
+private struct FlowChildSizesKey: PreferenceKey {
+    static var defaultValue: [AnyHashable: CGSize] = [:]
+
+    static func reduce(value: inout [AnyHashable: CGSize], nextValue: () -> [AnyHashable: CGSize]) {
+        value.merge(nextValue()) { $1 }
+    }
+}
+
+/// Wrapping row with equal horizontal/vertical spacing — the Compose `FlowRow` equivalent.
+@available(iOS 16.0, *)
+private struct FlowRowLayout: Layout {
+    struct Row {
+        var items: [(index: Int, size: CGSize)] = []
+        var width: CGFloat = 0
+        var height: CGFloat = 0
+    }
+
+    let gutter: CGFloat
+
+    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize {
+        let maxWidth = proposal.width ?? .infinity
+        let rows = rows(for: subviews, maxWidth: maxWidth)
+        let height = rows.reduce(0) { $0 + $1.height } + gutter * CGFloat(max(0, rows.count - 1))
+        return CGSize(width: proposal.width ?? rows.map(\.width).max() ?? 0, height: height)
+    }
+
+    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) {
+        var y = bounds.minY
+        for row in rows(for: subviews, maxWidth: bounds.width) {
+            var x = bounds.minX
+            for item in row.items {
+                subviews[item.index].place(
+                    at: CGPoint(x: x, y: y),
+                    anchor: .topLeading,
+                    proposal: ProposedViewSize(item.size)
+                )
+                x += item.size.width + gutter
+            }
+            y += row.height + gutter
+        }
+    }
+
+    private func rows(for subviews: Subviews, maxWidth: CGFloat) -> [Row] {
+        var rows: [Row] = []
+        var current = Row()
+        for index in subviews.indices {
+            let size = subviews[index].sizeThatFits(ProposedViewSize(width: maxWidth, height: nil))
+            let widthIfAppended = current.items.isEmpty ? size.width : current.width + gutter + size.width
+            // Sub-point tolerance: spans are computed to land exactly on `maxWidth`.
+            if !current.items.isEmpty, widthIfAppended > maxWidth + 0.5 {
+                rows.append(current)
+                current = Row()
+            }
+            current.width = current.items.isEmpty ? size.width : current.width + gutter + size.width
+            current.height = max(current.height, size.height)
+            current.items.append((index, size))
+        }
+        if !current.items.isEmpty { rows.append(current) }
+        return rows
+    }
+}

package/ios/Layout/Item.swift

@@ -1,12 +1,13 @@
 import SwiftUI
 
-/// Span-sized cell inside a `SectionView`. Reads the grid published by its container;
+/// Span-sized cell inside a `SectionView` / `CardView`. Reads the grid published by its container;
 /// without one it just wraps its content. Mirrors `vn.momo.kits.layout.Item`.
 public struct ItemView<Content: View>: View {
     // MARK: Lifecycle
 
+    /// `widthSpan` nil spans the full row, whatever the container's column count.
     public init(
-        widthSpan: Int = 12,
+        widthSpan: Int? = nil,
         heightSpan: Int = 0,
         @ViewBuilder content: @escaping () -> Content
     ) {
@@ -26,14 +27,14 @@ public struct ItemView<Content: View>: View {
 
     // MARK: Private
 
-    private let widthSpan: Int
+    private let widthSpan: Int?
     private let heightSpan: Int
     private let content: () -> Content
 
     @Environment(\.gridContext) private var grid
 
     private var width: CGFloat? {
-        grid.map { $0.sizeForSpan(widthSpan) }
+        grid.map { $0.sizeForSpan(widthSpan ?? $0.numberOfColumns) }
     }
 
     private var height: CGFloat? {