Merge pull request #128 from zenangst/Defect/Negative-item-index-for-…

…footer-reference Fix negative index
zenangst · Sep 18, 2019 · 7598584 · 7598584
2 parents bfa823a + f2abd7f
commit 7598584
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Blueprints.podspec b/Blueprints.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "Blueprints"
   s.summary          = "A collection of flow layouts that is meant to make your life easier."
-  s.version          = "0.12.1"
+  s.version          = "0.12.2"
   s.homepage         = "https://github.com/zenangst/Blueprints"
   s.license          = 'MIT'
   s.author           = { "Christoffer Winterkvist" => "[email protected]" }

diff --git a/Sources/Shared/Core/VerticalBlueprintLayout.swift b/Sources/Shared/Core/VerticalBlueprintLayout.swift
@@ -235,7 +235,12 @@ import UIKit
 
     let indexOffset = 1
     let lastHeaderReferenceHeight = resolveSizeForSupplementaryView(ofKind: .header, at: IndexPath(item: 0, section: numberOfSections - indexOffset)).height
-    let lastFooterReferenceHeight = resolveSizeForSupplementaryView(ofKind: .footer, at: IndexPath(item: numberOfItemsInSection(numberOfSections - indexOffset), section: numberOfSections - indexOffset)).height
+    let lastFooterReferenceHeight: CGFloat
+    if numberOfSections < 0 {
+      lastFooterReferenceHeight = resolveSizeForSupplementaryView(ofKind: .footer, at: IndexPath(item: numberOfItemsInSection(numberOfSections - indexOffset), section: numberOfSections - indexOffset)).height
+    } else {
+      lastFooterReferenceHeight = footerReferenceSize.height
+    }
 
     contentSize.height += lastHeaderReferenceHeight + lastFooterReferenceHeight
     contentSize.width = threshold

diff --git a/Sources/Shared/Mosaic/VerticalMosaicBlueprintLayout.swift b/Sources/Shared/Mosaic/VerticalMosaicBlueprintLayout.swift
@@ -172,7 +172,12 @@
 
     let indexOffset = 1
     let lastHeaderReferenceHeight = resolveSizeForSupplementaryView(ofKind: .header, at: IndexPath(item: 0, section: numberOfSections - indexOffset)).height
-    let lastFooterReferenceHeight = resolveSizeForSupplementaryView(ofKind: .footer, at: IndexPath(item: numberOfItemsInSection(numberOfSections - indexOffset), section: numberOfSections - indexOffset)).height
+    let lastFooterReferenceHeight: CGFloat
+    if numberOfSections < 0 {
+      lastFooterReferenceHeight = resolveSizeForSupplementaryView(ofKind: .footer, at: IndexPath(item: numberOfItemsInSection(numberOfSections - indexOffset), section: numberOfSections - indexOffset)).height
+    } else {
+      lastFooterReferenceHeight = footerReferenceSize.height
+    }
     contentSize.height += lastHeaderReferenceHeight + lastFooterReferenceHeight
     contentSize.width = threshold