Merge pull request #19751 from wordpress-mobile/bug/19609-fix-voice-over-crash

wargcm · web-flow · commit 99166f7d5ebf · 2022-12-09T12:46:04.000-05:00
Fix VoiceOver crash when initial screen is Home
diff --git 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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ class TopicsCollectionView: DynamicHeightCollectionView {`
`37`	`37`	`func collapse() {`
`38`	`38`	`coordinator?.changeState(.collapsed)`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ override func accessibilityElementCount() -> Int {`
	`42`	`+ guard let dataSource else {`
	`43`	`+ return 0`
	`44`	`+ }`
	`45`	`+`
	`46`	`+ return dataSource.collectionView(self, numberOfItemsInSection: 0)`
	`47`	`+ }`
`40`	`48`	`}`
`41`	`49`
`42`	`50`	`extension TopicsCollectionView: ReaderTopicCollectionViewCoordinatorDelegate {`