From c5aa0da68cf3e8911c2be3c5430225edd8603ec7 Mon Sep 17 00:00:00 2001 From: Chris McGraw <2454408+wargcm@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:49:20 -0500 Subject: [PATCH] Change `DynamicHeightCollectionView` to inherit from `UICollectionView` --- .../Reader/Tags View/DynamicHeightCollectionView.swift | 2 +- .../Reader/Tags View/TopicsCollectionView.swift | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift b/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift index aa57256e5e9b..aafe154c3734 100644 --- a/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Tags View/DynamicHeightCollectionView.swift @@ -1,6 +1,6 @@ import Foundation -class DynamicHeightCollectionView: AccessibleCollectionView { +class DynamicHeightCollectionView: UICollectionView { override func layoutSubviews() { super.layoutSubviews() diff --git a/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift b/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift index f0d31411ea5a..90d0e1484556 100644 --- a/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift +++ b/WordPress/Classes/ViewRelated/Reader/Tags View/TopicsCollectionView.swift @@ -37,6 +37,14 @@ class TopicsCollectionView: DynamicHeightCollectionView { func collapse() { coordinator?.changeState(.collapsed) } + + override func accessibilityElementCount() -> Int { + guard let dataSource else { + return 0 + } + + return dataSource.collectionView(self, numberOfItemsInSection: 0) + } } extension TopicsCollectionView: ReaderTopicCollectionViewCoordinatorDelegate {