From 172173eb1bf700cac5111cf9a8036b7aa6b6640a Mon Sep 17 00:00:00 2001 From: "Rajendran, Nandhini" Date: Mon, 4 Dec 2023 11:53:41 +0000 Subject: [PATCH] Revert "Merge branch 'feature/ONEAPP-5868' into 'develop'" This reverts merge request !1010 --- .../Atoms/Views/CarouselIndicator/BarsIndicatorView.swift | 4 +--- MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift index 4cff7bdb..2eefd716 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift @@ -213,9 +213,7 @@ open class BarsIndicatorView: CarouselIndicator { let accessibleIndex = MVMCoreUIUtility.getOrdinalString(forIndex: NSNumber(value: index + 1)) else { return } - let accessibilityValue = String(format: accessibleValueFormat, accessibleIndex, numberOfPages) - view.accessibilityLabel = accessibilityValue - view.accessibilityIdentifier = accessibilityValue + view.accessibilityLabel = String(format: accessibleValueFormat, accessibleIndex, numberOfPages) } public override func assessTouchOf(_ touchPoint_X: CGFloat) { diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index cb618524..6b360120 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -372,9 +372,7 @@ open class Carousel: View { self.carouselAccessibilityElement = carouselAccessibilityElement } - if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)), let pagingView = self.pagingView { - _accessibilityElements = [currentCell, carouselAccessibilityElement, pagingView] - } else if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)) { + if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)) { _accessibilityElements = [currentCell, carouselAccessibilityElement] } else { _accessibilityElements = [carouselAccessibilityElement]