Add hasDividers to ListStyle protocol

TokamakUI · Jul 27, 2020 · 05378b9 · 05378b9
1 parent 3ee995b
commit 05378b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Sources/TokamakCore/Styles/ListStyle.swift b/Sources/TokamakCore/Styles/ListStyle.swift
@@ -15,7 +15,10 @@
 //  Created by Carson Katri on 7/5/20.
 //
 
-public protocol ListStyle {}
+public protocol ListStyle {
+  var hasDividers: Bool { get }
+}
+
 /// A protocol implemented on the renderer to create platform-specific list styles.
 public protocol ListStyleDeferredToRenderer {
   func listBody<ListBody>(_ content: ListBody) -> AnyView where ListBody: View
@@ -51,22 +54,27 @@ public extension ListStyleDeferredToRenderer {
 public typealias DefaultListStyle = PlainListStyle
 
 public struct PlainListStyle: ListStyle {
+  public var hasDividers = true
   public init() {}
 }
 
 public struct GroupedListStyle: ListStyle {
+  public var hasDividers = true
   public init() {}
 }
 
 public struct InsetListStyle: ListStyle {
+  public var hasDividers = true
   public init() {}
 }
 
 public struct InsetGroupedListStyle: ListStyle {
+  public var hasDividers = true
   public init() {}
 }
 
 public struct SidebarListStyle: ListStyle {
+  public var hasDividers = false
   public init() {}
 }
 

diff --git a/Sources/TokamakCore/Views/Containers/List.swift b/Sources/TokamakCore/Views/Containers/List.swift
@@ -120,7 +120,7 @@ public struct _ListRow {
   public static func listRow<V: View>(_ view: V, _ style: ListStyle, isLast: Bool) -> some View {
     (style as? ListStyleDeferredToRenderer)?.listRow(view) ??
       AnyView(view.padding([.trailing, .top, .bottom]))
-    if !isLast && style as? SidebarListStyle == nil {
+    if !isLast && style.hasDividers {
       Divider()
     }
   }