Merge pull request bannzai#127 from kishikawakatsumi/content-offset

Fixed an issue that `contentSize` value was slightly incorrect

Author: kishikawakatsumi

Framework/Sources/SpreadsheetView+Layout.swift

@@ -326,8 +326,8 @@ extension SpreadsheetView {
     }
 
     func resetOverlayViewContentSize(_ contentInset: UIEdgeInsets) {
-        let width = contentInset.left + contentInset.right + tableView.state.frame.origin.x - intercellSpacing.width + tableView.state.contentSize.width
-        let height = contentInset.top + contentInset.bottom + tableView.state.frame.origin.y - intercellSpacing.height + tableView.state.contentSize.height
+        let width = contentInset.left + contentInset.right + tableView.state.frame.origin.x + tableView.state.contentSize.width
+        let height = contentInset.top + contentInset.bottom + tableView.state.frame.origin.y + tableView.state.contentSize.height
         overlayView.contentSize = CGSize(width: width, height: height)
         overlayView.contentOffset.x = tableView.state.contentOffset.x - contentInset.left
         overlayView.contentOffset.y = tableView.state.contentOffset.y - contentInset.top

Framework/Tests/HelperFunctions.swift

@@ -102,11 +102,11 @@ func numberOfVisibleRows(in view: SpreadsheetView, contentOffset: CGPoint = CGPo
 }
 
 func calculateWidth(range: CountableRange<Int>, parameters: Parameters) -> CGFloat {
-    return range.map { return parameters.columns[$0] }.reduce(0) { $0 + $1 + parameters.intercellSpacing.width }
+    return range.map { return parameters.columns[$0] }.reduce(0) { $0 + $1 + parameters.intercellSpacing.width } + (range.count > 0 ? parameters.intercellSpacing.width : 0)
 }
 
 func calculateHeight(range: CountableRange<Int>, parameters: Parameters) -> CGFloat {
-    return range.map { return parameters.rows[$0] }.reduce(0) { $0 + $1 + parameters.intercellSpacing.height }
+    return range.map { return parameters.rows[$0] }.reduce(0) { $0 + $1 + parameters.intercellSpacing.height } + (range.count > 0 ? parameters.intercellSpacing.height : 0)
 }
 
 func randomArray<T>(seeds: [T], count: Int) -> [T] {

Framework/Tests/ScrollTests.swift

@@ -338,8 +338,8 @@ class ScrollTests: XCTestCase {
                             scrollPosition: ScrollPosition, parameters: Parameters) {
         print("parameters: \(parameters), scrollPosition: \(scrollPosition)")
 
-        let frozenWidth = calculateWidth(range: 0..<parameters.frozenColumns, parameters: parameters)
-        let frozenHeight = calculateHeight(range: 0..<parameters.frozenRows, parameters: parameters)
+        let frozenWidth = calculateWidth(range: 0..<parameters.frozenColumns, parameters: parameters) - (parameters.frozenColumns > 0 ? parameters.intercellSpacing.width : 0)
+        let frozenHeight = calculateHeight(range: 0..<parameters.frozenRows, parameters: parameters) - (parameters.frozenRows > 0 ? parameters.intercellSpacing.height : 0)
 
         var width = calculateWidth(range: 0..<columns.from, parameters: parameters)
 

Framework/Tests/SelectionTests.swift

@@ -285,9 +285,9 @@ class SelectionTests: XCTestCase {
         var offsetHeight: CGFloat = 0
         var leftEdgeColumn = 0
         for column in columns.from..<columns.to {
-            let frozenWidth = calculateWidth(range: 0..<parameters.frozenColumns, parameters: parameters)
+            let frozenWidth = calculateWidth(range: 0..<parameters.frozenColumns, parameters: parameters) - (parameters.frozenColumns > 0 ? parameters.intercellSpacing.width : 0)
             if column > parameters.frozenColumns && width + parameters.columns[column] + parameters.intercellSpacing.width >= spreadsheetView.frame.width - frozenWidth {
-                offsetWidth = calculateWidth(range: parameters.frozenColumns..<column, parameters: parameters)
+                offsetWidth = calculateWidth(range: parameters.frozenColumns..<column, parameters: parameters) - parameters.intercellSpacing.width
                 if parameters.columnWidth - offsetWidth - frozenWidth < spreadsheetView.frame.width - frozenWidth {
                     offsetWidth -= spreadsheetView.frame.width - (parameters.columnWidth - offsetWidth)
                 }
@@ -301,9 +301,9 @@ class SelectionTests: XCTestCase {
             offsetHeight = 0
 
             for row in rows.from..<rows.to {
-                let frozenHeight = calculateHeight(range: 0..<parameters.frozenRows, parameters: parameters)
+                let frozenHeight = calculateHeight(range: 0..<parameters.frozenRows, parameters: parameters) - (parameters.frozenRows > 0 ? parameters.intercellSpacing.height : 0)
                 if row > parameters.frozenRows && height + parameters.rows[row] + parameters.intercellSpacing.height >= spreadsheetView.frame.height - frozenHeight {
-                    offsetHeight = calculateHeight(range: parameters.frozenRows..<(row), parameters: parameters)
+                    offsetHeight = calculateHeight(range: parameters.frozenRows..<(row), parameters: parameters) - parameters.intercellSpacing.height
                     if parameters.rowHeight - offsetHeight - frozenHeight < spreadsheetView.frame.height - frozenHeight {
                         offsetHeight -= spreadsheetView.frame.height - (parameters.rowHeight - offsetHeight)
                     }

Framework/Tests/ViewTests.swift

@@ -232,6 +232,11 @@ class ViewTests: XCTestCase {
         }
 
         let spreadsheetView = viewController.spreadsheetView
+
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: calculateWidth(range: 0..<firstParameters.numberOfColumns, parameters: firstParameters),
+                                                           height: calculateHeight(range: 0..<firstParameters.numberOfRows, parameters: firstParameters)))
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: spreadsheetView.tableView.frame.origin.x + spreadsheetView.tableView.contentSize.width,
+                                                           height: spreadsheetView.tableView.frame.origin.y + spreadsheetView.tableView.contentSize.height))
         verify(view: spreadsheetView, parameters: firstParameters)
 
         let secondParameters = Parameters(numberOfColumns: 20, numberOfRows: 30, frozenColumns: 2, frozenRows: 3, intercellSpacing: CGSize(width: 2, height: 2), gridStyle: .solid(width: 2, color: .yellow))
@@ -240,6 +245,10 @@ class ViewTests: XCTestCase {
         spreadsheetView.reloadData()
         waitRunLoop()
 
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: calculateWidth(range: 0..<secondParameters.numberOfColumns, parameters: secondParameters),
+                                                           height: calculateHeight(range: 0..<secondParameters.numberOfRows, parameters: secondParameters)))
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: spreadsheetView.tableView.frame.origin.x + spreadsheetView.tableView.contentSize.width,
+                                                           height: spreadsheetView.tableView.frame.origin.y + spreadsheetView.tableView.contentSize.height))
         verify(view: spreadsheetView, parameters: secondParameters)
 
         let thirdParameters = Parameters(numberOfColumns: 3, numberOfRows: 6, frozenColumns: 0, frozenRows: 0)
@@ -248,7 +257,23 @@ class ViewTests: XCTestCase {
         spreadsheetView.reloadData()
         waitRunLoop()
 
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: calculateWidth(range: 0..<thirdParameters.numberOfColumns, parameters: thirdParameters),
+                                                           height: calculateHeight(range: 0..<thirdParameters.numberOfRows, parameters: thirdParameters)))
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: spreadsheetView.tableView.frame.origin.x + spreadsheetView.tableView.contentSize.width,
+                                                           height: spreadsheetView.tableView.frame.origin.y + spreadsheetView.tableView.contentSize.height))
         verify(view: spreadsheetView, parameters: thirdParameters)
+
+        let fourthParameters = Parameters(numberOfColumns: 50, numberOfRows: 60, frozenColumns: 1, frozenRows: 1)
+        applyNewParameters(fourthParameters, to: viewController)
+
+        spreadsheetView.reloadData()
+        waitRunLoop()
+
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: calculateWidth(range: 0..<fourthParameters.numberOfColumns, parameters: fourthParameters),
+                                                           height: calculateHeight(range: 0..<fourthParameters.numberOfRows, parameters: fourthParameters)))
+        XCTAssertEqual(spreadsheetView.contentSize, CGSize(width: spreadsheetView.tableView.frame.origin.x + spreadsheetView.tableView.contentSize.width,
+                                                           height: spreadsheetView.tableView.frame.origin.y + spreadsheetView.tableView.contentSize.height))
+        verify(view: spreadsheetView, parameters: fourthParameters)
     }
 
     func applyNewParameters(_ parameters: Parameters, to viewController: SpreadsheetViewController) {