Added mandatory reading of the size of the cell from delegate on reload.

ekazaev · Oct 4, 2022 · 3f1a1b8 · 3f1a1b8
1 parent 62bec2e
commit 3f1a1b8
Show file tree

Hide file tree

Showing 77 changed files with 2,922 additions and 2,810 deletions.
diff --git a/ChatLayout/Classes/Core/CollectionViewChatLayout.swift b/ChatLayout/Classes/Core/CollectionViewChatLayout.swift
@@ -874,7 +874,7 @@ extension CollectionViewChatLayout {
  return ItemModel.Configuration(alignment: alignment(for: element, at: indexPath), preferredSize: itemSize.estimated, calculatedSize: itemSize.exact)
  }
 
- func alignment(for element: ItemKind, at itemPath: ItemPath) -> ChatItemAlignment {
+ private func alignment(for element: ItemKind, at itemPath: ItemPath) -> ChatItemAlignment {
  let indexPath = itemPath.indexPath
  return alignment(for: element, at: indexPath)
  }

diff --git a/ChatLayout/Classes/Core/Model/StateController.swift b/ChatLayout/Classes/Core/Model/StateController.swift
@@ -32,8 +32,6 @@ protocol ChatLayoutRepresentation: AnyObject {
 
  func configuration(for element: ItemKind, at itemPath: ItemPath) -> ItemModel.Configuration
 
- func alignment(for element: ItemKind, at itemPath: ItemPath) -> ChatItemAlignment
-
  func shouldPresentHeader(at sectionIndex: Int) -> Bool
 
  func shouldPresentFooter(at sectionIndex: Int) -> Bool
@@ -401,6 +399,16 @@ final class StateController {
  }
 
  func process(changeItems: [ChangeItem]) {
+ func applyConfiguration(_ configuration: ItemModel.Configuration, to item: inout ItemModel) {
+ item.alignment = configuration.alignment
+ if let calculatedSize = configuration.calculatedSize {
+ item.calculatedSize = calculatedSize
+ item.calculatedOnce = true
+ } else {
+ item.resetSize()
+ }
+ }
+
  batchUpdateCompensatingOffset = 0
  proposedCompensatingOffset = 0
  let changeItems = changeItems.sorted()
@@ -451,11 +459,10 @@ final class StateController {
  var header: ItemModel?
  if layoutRepresentation.shouldPresentHeader(at: sectionIndex) == true {
  let headerIndexPath = IndexPath(item: 0, section: sectionIndex)
- header = section.header ?? ItemModel(with: layoutRepresentation.configuration(for: .header, at: headerIndexPath.itemPath))
- header?.resetSize()
- if section.header != nil {
- header?.alignment = layoutRepresentation.alignment(for: .cell, at: headerIndexPath.itemPath)
- }
+ var newHeader = section.header ?? ItemModel(with: layoutRepresentation.configuration(for: .header, at: headerIndexPath.itemPath))
+ let configuration = layoutRepresentation.configuration(for: .header, at: headerIndexPath.itemPath)
+ applyConfiguration(configuration, to: &newHeader)
+ header = newHeader
  } else {
  header = nil
  }
@@ -464,11 +471,10 @@ final class StateController {
  var footer: ItemModel?
  if layoutRepresentation.shouldPresentFooter(at: sectionIndex) == true {
  let footerIndexPath = IndexPath(item: 0, section: sectionIndex)
- footer = section.footer ?? ItemModel(with: layoutRepresentation.configuration(for: .footer, at: footerIndexPath.itemPath))
- footer?.resetSize()
- if section.footer != nil {
- footer?.alignment = layoutRepresentation.alignment(for: .cell, at: footerIndexPath.itemPath)
- }
+ var newFooter = section.footer ?? ItemModel(with: layoutRepresentation.configuration(for: .footer, at: footerIndexPath.itemPath))
+ let configuration = layoutRepresentation.configuration(for: .footer, at: footerIndexPath.itemPath)
+ applyConfiguration(configuration, to: &newFooter)
+ footer = newFooter
  } else {
  footer = nil
  }
@@ -480,11 +486,11 @@ final class StateController {
  let itemIndexPath = IndexPath(item: index, section: sectionIndex)
  if index < oldItems.count {
  newItem = oldItems[index]
- newItem.alignment = layoutRepresentation.alignment(for: .cell, at: itemIndexPath.itemPath)
+ let configuration = layoutRepresentation.configuration(for: .cell, at: itemIndexPath.itemPath)
+ applyConfiguration(configuration, to: &newItem)
  } else {
  newItem = ItemModel(with: layoutRepresentation.configuration(for: .cell, at: itemIndexPath.itemPath))
  }
- newItem.resetSize()
  return newItem
  }
  section.set(items: ContiguousArray(items))
@@ -495,8 +501,8 @@ final class StateController {
  assertionFailure("Item at index path (\(indexPath.section) - \(indexPath.item)) does not exist.")
  return
  }
- item.resetSize()
- item.alignment = layoutRepresentation.alignment(for: .cell, at: indexPath.itemPath)
+ let configuration = layoutRepresentation.configuration(for: .cell, at: indexPath.itemPath)
+ applyConfiguration(configuration, to: &item)
  afterUpdateModel.replaceItem(item, at: indexPath)
  reloadedIndexes.insert(indexPath)
  case let .sectionMove(initialSectionIndex: initialSectionIndex, finalSectionIndex: finalSectionIndex):

diff --git a/Example/Tests/StateControllerProcessUpdatesTests.swift b/Example/Tests/StateControllerProcessUpdatesTests.swift
@@ -65,13 +65,13 @@ class StateControllerProcessUpdatesTests: XCTestCase {
 
  layout.settings.estimatedItemSize = .init(width: 300, height: 50)
  layout.controller.process(changeItems: changeItems)
- XCTAssertEqual(layout.controller.contentHeight(at: .beforeUpdate), layout.controller.contentHeight(at: .afterUpdate))
+ XCTAssertEqual(layout.controller.contentHeight(at: .beforeUpdate) + CGFloat(changeItems.count * 10), layout.controller.contentHeight(at: .afterUpdate))
  layout.controller.commitUpdates()
 
  layout.controller.process(changeItems: [.sectionReload(sectionIndex: 0),
  .sectionReload(sectionIndex: 1)])
 
- XCTAssertEqual(layout.controller.contentHeight(at: .beforeUpdate), layout.controller.contentHeight(at: .afterUpdate))
+ XCTAssertEqual(layout.controller.contentHeight(at: .beforeUpdate) + CGFloat(10 * 4), layout.controller.contentHeight(at: .afterUpdate))
  layout.controller.commitUpdates()
  }
 
@@ -113,10 +113,11 @@ class StateControllerProcessUpdatesTests: XCTestCase {
  // Frames
  XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .header, at: .beforeUpdate)?.origin, .zero)
  XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .cell, at: .afterUpdate)?.origin, .zero)
- XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .cell, at: .beforeUpdate)?.size, layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .cell, at: .afterUpdate)?.size)
- XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 99, section: 0), kind: .cell, at: .afterUpdate)?.size, CGSize(width: 300, height: 40))
+ XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .cell, at: .beforeUpdate)?.size, CGSize(width: 300, height: 40))
+ XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 0, section: 0), kind: .cell, at: .afterUpdate)?.size, CGSize(width: 300, height: 50))
+ XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 99, section: 0), kind: .cell, at: .beforeUpdate)?.size, CGSize(width: 300, height: 40))
  XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 100, section: 0), kind: .cell, at: .afterUpdate)?.size, layout.settings.estimatedItemSize)
- XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 49, section: 1), kind: .cell, at: .afterUpdate)?.size, CGSize(width: 300, height: 40))
+ XCTAssertEqual(layout.controller.itemFrame(for: ItemPath(item: 49, section: 1), kind: .cell, at: .afterUpdate)?.size, CGSize(width: 300, height: 50))
 
  layout.controller.commitUpdates()
  }

diff --git a/docs/Classes/CellLayoutContainerView.html b/docs/Classes/CellLayoutContainerView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -457,7 +457,7 @@ <h4>Parameters</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/ChatLayoutAttributes.html b/docs/Classes/ChatLayoutAttributes.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -416,7 +416,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/ChatLayoutInvalidationContext.html b/docs/Classes/ChatLayoutInvalidationContext.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -201,7 +201,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/CollectionViewChatLayout.html b/docs/Classes/CollectionViewChatLayout.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -1308,7 +1308,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/ContainerCollectionReusableView.html b/docs/Classes/ContainerCollectionReusableView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -377,7 +377,7 @@ <h4>Parameters</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/ContainerCollectionViewCell.html b/docs/Classes/ContainerCollectionViewCell.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -377,7 +377,7 @@ <h4>Parameters</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/EdgeAligningView.html b/docs/Classes/EdgeAligningView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -361,7 +361,7 @@ <h4>Parameters</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/EdgeAligningView/Edge.html b/docs/Classes/EdgeAligningView/Edge.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -281,7 +281,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/ImageMaskedView.html b/docs/Classes/ImageMaskedView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -401,7 +401,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/MessageContainerView.html b/docs/Classes/MessageContainerView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -347,7 +347,7 @@ <h4>Parameters</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Classes/RoundedCornersContainerView.html b/docs/Classes/RoundedCornersContainerView.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="../index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -347,7 +347,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>

diff --git a/docs/Core.html b/docs/Core.html
@@ -21,7 +21,7 @@
  <header class="header">
  <p class="header-col header-col--primary">
  <a class="header-link" href="index.html">
- ChatLayout 1.2.10 Docs
+ ChatLayout 1.2.11 Docs
  </a>
  (100% documented)
  </p>
@@ -435,7 +435,7 @@ <h4>Declaration</h4>
  </article>
  </div>
  <section class="footer">
- <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-03)</p>
+ <p>&copy; 2022 <a class="link" href="https:/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2022-10-04)</p>
  <p>Generated by <a class="link" href="https:/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
  </section>
  </body>