Update cell accessibility before configuration

amkomatz · Nov 13, 2019 · bc26b7d · bc26b7d
1 parent ae8dd66
commit bc26b7d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/EXTable.podspec b/EXTable.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "EXTable"
-  spec.version      = "1.2.1"
+  spec.version      = "1.2.2"
   spec.summary      = "A declarative table view controller."
   spec.homepage     = "https://github.com/amkomatz/EXTable"
   spec.license      = { :type => "MIT", :file => "LICENSE" }

diff --git a/EXTable.xcodeproj/project.pbxproj b/EXTable.xcodeproj/project.pbxproj
@@ -429,6 +429,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.amkomatz.EXTable;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -458,6 +459,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.amkomatz.EXTable;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/.../project.xcworkspace/xcuserdata/austin-michael.xcuserdatad/UserInterfaceState.xcuserstate b/.../project.xcworkspace/xcuserdata/austin-michael.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/EXTable/DataSource/Row.swift b/EXTable/DataSource/Row.swift
@@ -44,7 +44,19 @@ extension Row {
             for: indexPath
         ) as! CellType
 
+        if let accessibilityContainer = self as? AccessibilityContaining {
+            cell.accessibilityHint = accessibilityContainer.accessibilityHint
+            cell.accessibilityLabel = accessibilityContainer.accessibilityLabel
+            cell.accessibilityValue = accessibilityContainer.accessibilityValue
+            cell.accessibilityIdentifier = accessibilityContainer.accessibilityIdentifier
+
+            if let accessibilityTraits = accessibilityContainer.accessibilityTraits {
+                cell.accessibilityTraits = accessibilityTraits
+            }
+        }
+
         cell.configure(for: data)
+
         return cell
     }
 }

diff --git a/EXTable/EXTableViewController/EXTableViewController+UITableViewDataSource.swift b/EXTable/EXTableViewController/EXTableViewController+UITableViewDataSource.swift
@@ -37,17 +37,6 @@ extension EXTableViewController {
 
         let cell = row.configuredCell(for: tableView, at: indexPath)!
 
-        if let accessibilityContainer = row.base as? AccessibilityContaining {
-            cell.accessibilityHint = accessibilityContainer.accessibilityHint
-            cell.accessibilityLabel = accessibilityContainer.accessibilityLabel
-            cell.accessibilityValue = accessibilityContainer.accessibilityValue
-            cell.accessibilityIdentifier = accessibilityContainer.accessibilityIdentifier
-
-            if let accessibilityTraits = accessibilityContainer.accessibilityTraits {
-                cell.accessibilityTraits = accessibilityTraits
-            }
-        }
-
         return cell
     }
 

diff --git a/EXTable/Info.plist b/EXTable/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>