From 0b9f075eba695b45969778e21069ac95721500a1 Mon Sep 17 00:00:00 2001
From: Niv Taiber <nivt@DariaArasiPhone.DHCP.thefacebook.com>
Date: Thu, 14 Jul 2016 16:12:50 +0100
Subject: [PATCH] Removed accessibilityIdentifier from context

---
 ComponentKit/Accessibility/CKComponentAccessibility.h  | 9 ++++-----
 ComponentKit/Accessibility/CKComponentAccessibility.mm | 3 ---
 ComponentKit/Components/CKButtonComponent.h            | 2 --
 ComponentKit/Components/CKButtonComponent.mm           | 2 --
 ComponentKitTests/CKComponentAccessibilityTests.mm     | 6 +++---
 ComponentTextKit/CKTextComponent.h                     | 1 -
 ComponentTextKit/CKTextComponent.mm                    | 1 -
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/ComponentKit/Accessibility/CKComponentAccessibility.h b/ComponentKit/Accessibility/CKComponentAccessibility.h
index 0efc9a91c..f0f296c28 100644
--- a/ComponentKit/Accessibility/CKComponentAccessibility.h
+++ b/ComponentKit/Accessibility/CKComponentAccessibility.h
@@ -43,17 +43,16 @@ struct CKComponentAccessibilityTextAttribute {
 
 /**
  Separate structure to handle accessibility as we want the components infrastructure to decide wether to use it or not depending if accessibility is enabled or not.
+ Not to be confused with accessibilityIdentifier which is used for automation to identify elements on the screen. To set the identifier pass in {@selector(setAccessibilityIdentifier:), @"accessibilityId"} with the viewConfiguration's attributes
  */
 struct CKComponentAccessibilityContext {
   NSNumber *isAccessibilityElement;
-  NSString *accessibilityIdentifier;
   CKComponentAccessibilityTextAttribute accessibilityLabel;
   CKComponentAction accessibilityComponentAction;
 
   bool operator==(const CKComponentAccessibilityContext &other) const
   {
-    return CKObjectIsEqual(other.accessibilityIdentifier, accessibilityIdentifier)
-    && CKObjectIsEqual(other.isAccessibilityElement, isAccessibilityElement)
+    return CKObjectIsEqual(other.isAccessibilityElement, isAccessibilityElement)
     && CKObjectIsEqual(other.accessibilityLabel.value(), accessibilityLabel.value())
     && other.accessibilityComponentAction == accessibilityComponentAction;
   }
@@ -64,8 +63,8 @@ namespace CK {
     namespace Accessibility {
       /**
        @return A modified configuration for which extra view component attributes have been added to handle accessibility.
-       e.g: The following view configuration `{[UIView class], {{@selector(setBlah:), @"Blah"}}, {.accessibilityIdentifier = @"accessibilityId"}}`
-       will become `{[UIView class], {{@selector(setBlah:), @"Blah"}, {@selector(setAccessibilityIdentifier), @"accessibilityId"}}, {.accessibilityIdentifier = @"accessibilityId"}}`
+       e.g: The following view configuration `{[UIView class], {{@selector(setBlah:), @"Blah"}}, {.accessibilityLabel = @"accessibilityLabel"}}`
+       will become `{[UIView class], {{@selector(setBlah:), @"Blah"}, {@selector(setAccessibilityLabel), @"accessibilityLabel"}}, {.accessibilityLabel = @"accessibilityLabel"}}`
        */
       CKComponentViewConfiguration AccessibleViewConfiguration(const CKComponentViewConfiguration &viewConfiguration);
       BOOL IsAccessibilityEnabled();
diff --git a/ComponentKit/Accessibility/CKComponentAccessibility.mm b/ComponentKit/Accessibility/CKComponentAccessibility.mm
index a3977c1f2..fd87da1cc 100644
--- a/ComponentKit/Accessibility/CKComponentAccessibility.mm
+++ b/ComponentKit/Accessibility/CKComponentAccessibility.mm
@@ -20,9 +20,6 @@
 static CKViewComponentAttributeValueMap ViewAttributesFromAccessibilityContext(const CKComponentAccessibilityContext &accessibilityContext)
 {
   CKViewComponentAttributeValueMap accessibilityAttributes;
-  if (accessibilityContext.accessibilityIdentifier) {
-    accessibilityAttributes[@selector(setAccessibilityIdentifier:)] = accessibilityContext.accessibilityIdentifier;
-  }
   if (accessibilityContext.isAccessibilityElement) {
     accessibilityAttributes[@selector(setIsAccessibilityElement:)] = accessibilityContext.isAccessibilityElement;
   }
diff --git a/ComponentKit/Components/CKButtonComponent.h b/ComponentKit/Components/CKButtonComponent.h
index 0913c9797..b7909bf7c 100644
--- a/ComponentKit/Components/CKButtonComponent.h
+++ b/ComponentKit/Components/CKButtonComponent.h
@@ -14,8 +14,6 @@
 #import <ComponentKit/CKComponentAction.h>
 
 struct CKButtonComponentAccessibilityConfiguration {
-  /** Accessibility identifier */
-  NSString *accessibilityIdentifier;
   /** Accessibility label for the button. If one is not provided, the button title will be used as a label */
   NSString *accessibilityLabel;
 };
diff --git a/ComponentKit/Components/CKButtonComponent.mm b/ComponentKit/Components/CKButtonComponent.mm
index dbf128227..4b7b0a985 100644
--- a/ComponentKit/Components/CKButtonComponent.mm
+++ b/ComponentKit/Components/CKButtonComponent.mm
@@ -146,7 +146,6 @@ + (instancetype)newWithTitles:(const std::unordered_map<UIControlState, NSString
     {titleFontAttribute, titleFont},
     {@selector(setSelected:), @(selected)},
     {@selector(setEnabled:), @(enabled)},
-    {@selector(setAccessibilityIdentifier:), accessibilityConfiguration.accessibilityIdentifier},
     CKComponentActionAttribute(action, UIControlEventTouchUpInside),
   });
 
@@ -161,7 +160,6 @@ + (instancetype)newWithTitles:(const std::unordered_map<UIControlState, NSString
                             [UIButton class],
                             std::move(attributes),
                             {
-                              .accessibilityIdentifier = accessibilityConfiguration.accessibilityIdentifier,
                               .accessibilityLabel = accessibilityConfiguration.accessibilityLabel,
                               .accessibilityComponentAction = enabled ? action : NULL
                             }
diff --git a/ComponentKitTests/CKComponentAccessibilityTests.mm b/ComponentKitTests/CKComponentAccessibilityTests.mm
index 28d25d264..255ce0de3 100644
--- a/ComponentKitTests/CKComponentAccessibilityTests.mm
+++ b/ComponentKitTests/CKComponentAccessibilityTests.mm
@@ -33,15 +33,15 @@ - (void)testAccessibilityContextItemsAreProperlyTransformedToViewAttributes
 {
   CKComponentViewConfiguration viewConfiguration = {
     [UIView class],
-    {{@selector(setBlah:), @"Blah"}},
+    {{@selector(setBlah:), @"Blah"}, {@selector(setAccessibilityIdentifier:), @"batman"}},
     {
-      .accessibilityIdentifier = @"batman", .isAccessibilityElement = @NO, .accessibilityLabel = ^{ return @"accessibleBatman"; }
+      .isAccessibilityElement = @NO, .accessibilityLabel = ^{ return @"accessibleBatman"; }
     }};
   CKComponentViewConfiguration expectedViewConfiguration = {
     [UIView class],
     {{@selector(setBlah:), @"Blah"}, {@selector(setAccessibilityIdentifier:), @"batman"}, {@selector(setAccessibilityLabel:), @"accessibleBatman"}, {@selector(setIsAccessibilityElement:), @NO}},
     {
-      .accessibilityIdentifier = @"batman", .isAccessibilityElement = @NO, .accessibilityLabel = @"accessibleBatman"
+      .isAccessibilityElement = @NO, .accessibilityLabel = @"accessibleBatman"
     }};
   XCTAssertTrue(AccessibleViewConfiguration(viewConfiguration) == expectedViewConfiguration, @"Accessibility attributes were applied incorrectly");
 }
diff --git a/ComponentTextKit/CKTextComponent.h b/ComponentTextKit/CKTextComponent.h
index 07e40030f..f4fa9c5c8 100644
--- a/ComponentTextKit/CKTextComponent.h
+++ b/ComponentTextKit/CKTextComponent.h
@@ -16,7 +16,6 @@
 struct CKTextComponentAccessibilityContext
 {
   NSNumber *isAccessibilityElement;
-  NSString *accessibilityIdentifier;
   NSNumber *providesAccessibleElements;
   /**
    Should rarely be used, the component's text will be used by default.
diff --git a/ComponentTextKit/CKTextComponent.mm b/ComponentTextKit/CKTextComponent.mm
index a4b8ad090..96d2f351b 100644
--- a/ComponentTextKit/CKTextComponent.mm
+++ b/ComponentTextKit/CKTextComponent.mm
@@ -74,7 +74,6 @@ + (instancetype)newWithTextAttributes:(const CKTextKitAttributes &)attributes
     std::move(copiedMap),
     {
       .isAccessibilityElement = options.accessibilityContext.isAccessibilityElement,
-      .accessibilityIdentifier = options.accessibilityContext.accessibilityIdentifier,
       .accessibilityLabel = options.accessibilityContext.accessibilityLabel.hasText()
       ? options.accessibilityContext.accessibilityLabel : ^{ return copyAttributes.attributedString.string; }
     }